diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-10-18 15:42:48 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-10-18 15:42:48 (GMT) |
| commit | c3e40f8c5bc7eb1c6aa60074c729219ce8881276 (patch) | |
| tree | 3d3571cc555873633295107fba63f892ba1d5d85 /Lib | |
| parent | 61de57f175bff135b85f66caa159861aa8ee18dd (diff) | |
| download | cpython-c3e40f8c5bc7eb1c6aa60074c729219ce8881276.zip cpython-c3e40f8c5bc7eb1c6aa60074c729219ce8881276.tar.gz cpython-c3e40f8c5bc7eb1c6aa60074c729219ce8881276.tar.bz2 | |
timeit: add nsec (nanosecond) unit for format timings
Issue #28240.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_timeit.py | 2 | ||||
| -rw-r--r-- | Lib/timeit.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py index b297222..4e8c118 100644 --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -331,7 +331,7 @@ class TestTimeit(unittest.TestCase): invalid = self.run_main(seconds_per_increment=0.002, switches=['-u', 'parsec']) self.assertEqual(error_stringio.getvalue(), - "Unrecognized unit. Please select usec, msec, or sec.\n") + "Unrecognized unit. Please select nsec, usec, msec, or sec.\n") def test_main_exception(self): with captured_stderr() as error_stringio: diff --git a/Lib/timeit.py b/Lib/timeit.py index 8bc6a9e..23bdd02 100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -18,7 +18,7 @@ Options: Execution time of this setup statement is NOT timed. -p/--process: use time.process_time() (default is time.perf_counter()) -v/--verbose: print raw timing results; repeat for more digits precision - -u/--unit: set the output time unit (usec, msec, or sec) + -u/--unit: set the output time unit (nsec, usec, msec, or sec) -h/--help: print this usage message and exit --: separate options from statement, use when statement starts with - statement: statement to be timed (default 'pass') @@ -272,7 +272,7 @@ def main(args=None, *, _wrap_timer=None): repeat = default_repeat verbose = 0 time_unit = None - units = {"usec": 1e-6, "msec": 1e-3, "sec": 1.0} + units = {"nsec": 1e-9, "usec": 1e-6, "msec": 1e-3, "sec": 1.0} precision = 3 for o, a in opts: if o in ("-n", "--number"): @@ -283,7 +283,7 @@ def main(args=None, *, _wrap_timer=None): if a in units: time_unit = a else: - print("Unrecognized unit. Please select usec, msec, or sec.", + print("Unrecognized unit. Please select nsec, usec, msec, or sec.", file=sys.stderr) return 2 if o in ("-r", "--repeat"): |