mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

time.clock() now emits a DeprecationWarning (GH-4020)

Browse source 
bpo-31803: time.clock() and time.get_clock_info('clock') now emit a
DeprecationWarning warning.

Replace time.clock() with time.perf_counter() in tests and demos.

Remove also hasattr(time, 'monotonic') in test_time since time.monotonic()
is now always available since Python 3.5.
This commit is contained in:
Victor Stinner 2017-10-17 14:46:45 -07:00 • committed by GitHub
parent de86073a76
commit 884d13a55f
14 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_time.py
View file

@ -9,6 +9,7 @@ import sysconfig
import time
import threading
import unittest
import warnings
try:
import _testcapi
except ImportError:
@ -64,9 +65,11 @@ class TimeTestCase(unittest.TestCase):
self.assertTrue(info.adjustable)
def test_clock(self):
time.clock()
with self.assertWarns(DeprecationWarning):
time.clock()
info = time.get_clock_info('clock')
with self.assertWarns(DeprecationWarning):
info = time.get_clock_info('clock')
self.assertTrue(info.monotonic)
self.assertFalse(info.adjustable)
@ -427,8 +430,6 @@ class TimeTestCase(unittest.TestCase):
pass
self.assertEqual(time.strftime('%Z', tt), tzname)
@unittest.skipUnless(hasattr(time, 'monotonic'),
'need time.monotonic')
def test_monotonic(self):
# monotonic() should not go backward
times = [time.monotonic() for n in range(100)]
@ -467,8 +468,6 @@ class TimeTestCase(unittest.TestCase):
self.assertTrue(info.monotonic)
self.assertFalse(info.adjustable)
@unittest.skipUnless(hasattr(time, 'monotonic'),
'need time.monotonic')
@unittest.skipUnless(hasattr(time, 'clock_settime'),
'need time.clock_settime')
def test_monotonic_settime(self):
@ -506,12 +505,15 @@ class TimeTestCase(unittest.TestCase):
self.assertRaises(ValueError, time.ctime, float("nan"))
def test_get_clock_info(self):
clocks = ['clock', 'perf_counter', 'process_time', 'time']
if hasattr(time, 'monotonic'):
clocks.append('monotonic')
clocks = ['clock', 'monotonic', 'perf_counter', 'process_time', 'time']
for name in clocks:
info = time.get_clock_info(name)
if name == 'clock':
with self.assertWarns(DeprecationWarning):
info = time.get_clock_info('clock')
else:
info = time.get_clock_info(name)
#self.assertIsInstance(info, dict)
self.assertIsInstance(info.implementation, str)
self.assertNotEqual(info.implementation, '')