[Python-checkins] cpython: timeit: remove --clock and --time options

Tue Oct 18 11:20:58 EDT 2016

https://hg.python.org/cpython/rev/975df4c13db6
changeset: 104539:975df4c13db6
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Oct 18 17:18:21 2016 +0200
summary:
 timeit: remove --clock and --time options
Issue #28240: timeit: remove -c/--clock and -t/--time command line options
which were deprecated since Python 3.3.
files:
 Doc/library/timeit.rst | 10 +---------
 Lib/test/test_timeit.py | 12 ------------
 Lib/timeit.py | 8 +-------
 Misc/NEWS | 3 +++
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -197,7 +197,7 @@
 
 When called as a program from the command line, the following form is used::
 
- python -m timeit [-n N] [-r N] [-u U] [-s S] [-t] [-c] [-h] [statement ...]
+ python -m timeit [-n N] [-r N] [-u U] [-s S] [-h] [statement ...]
 
 Where the following options are understood:
 
@@ -222,20 +222,12 @@
 
 .. versionadded:: 3.3
 
-.. cmdoption:: -t, --time
-
- use :func:`time.time` (deprecated)
-
 .. cmdoption:: -u, --unit=U
 
 specify a time unit for timer output; can select usec, msec, or sec
 
 .. versionadded:: 3.5
 
-.. cmdoption:: -c, --clock
-
- use :func:`time.clock` (deprecated)
-
 .. cmdoption:: -v, --verbose
 
 print raw timing results; repeat for more digits precision
diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py
--- a/Lib/test/test_timeit.py
+++ b/Lib/test/test_timeit.py
@@ -293,18 +293,6 @@
 # the help text, but since it's there, check for it.
 self.assertEqual(s, timeit.__doc__ + ' ')
 
- def test_main_using_time(self):
- fake_timer = FakeTimer()
- s = self.run_main(switches=['-t'], timer=fake_timer)
- self.assertEqual(s, self.MAIN_DEFAULT_OUTPUT)
- self.assertIs(fake_timer.saved_timer, time.time)
-
- def test_main_using_clock(self):
- fake_timer = FakeTimer()
- s = self.run_main(switches=['-c'], timer=fake_timer)
- self.assertEqual(s, self.MAIN_DEFAULT_OUTPUT)
- self.assertIs(fake_timer.saved_timer, time.clock)
-
 def test_main_verbose(self):
 s = self.run_main(switches=['-v'])
 self.assertEqual(s, dedent("""\
diff --git a/Lib/timeit.py b/Lib/timeit.py
--- a/Lib/timeit.py
+++ b/Lib/timeit.py
@@ -9,7 +9,7 @@
 Library usage: see the Timer class.
 
 Command line usage:
- python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-p] [-h] [--] [statement]
+ python timeit.py [-n N] [-r N] [-s S] [-p] [-h] [--] [statement]
 
 Options:
 -n/--number N: how many times to execute 'statement' (default: see below)
@@ -17,8 +17,6 @@
 -s/--setup S: statement to be executed once initially (default 'pass').
 Execution time of this setup statement is NOT timed.
 -p/--process: use time.process_time() (default is time.perf_counter())
- -t/--time: use time.time() (deprecated)
- -c/--clock: use time.clock() (deprecated)
 -v/--verbose: print raw timing results; repeat for more digits precision
 -u/--unit: set the output time unit (usec, msec, or sec)
 -h/--help: print this usage message and exit
@@ -291,10 +289,6 @@
 repeat = int(a)
 if repeat <= 0:
 repeat = 1
- if o in ("-t", "--time"):
- timer = time.time
- if o in ("-c", "--clock"):
- timer = time.clock
 if o in ("-p", "--process"):
 timer = time.process_time
 if o in ("-v", "--verbose"):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #28240: timeit: remove ``-c/--clock`` and ``-t/--time`` command line
+ options which were deprecated since Python 3.3.
+
 - Issue #28240: timeit now repeats the benchmarks 5 times instead of only 3
 to make benchmarks more reliable.
 
-- 
Repository URL: https://hg.python.org/cpython
