Skip to content

Commit 1f17774

Browse files
hugovkgaweng
andauthored
[3.14] gh-148254: Use singular "sec" in timeit verbose output (GH-148290) (#148303)
Co-authored-by: gaweng <38250674+gaweng@users.noreply.github.com>
1 parent 1a3c03c commit 1f17774

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Lib/test/test_timeit.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def test_main_help(self):
302302
def test_main_verbose(self):
303303
s = self.run_main(switches=['-v'])
304304
self.assertEqual(s, dedent("""\
305-
1 loop -> 1 secs
305+
1 loop -> 1 sec
306306
307307
raw times: 1 sec, 1 sec, 1 sec, 1 sec, 1 sec
308308
@@ -312,19 +312,19 @@ def test_main_verbose(self):
312312
def test_main_very_verbose(self):
313313
s = self.run_main(seconds_per_increment=0.000_030, switches=['-vv'])
314314
self.assertEqual(s, dedent("""\
315-
1 loop -> 3e-05 secs
316-
2 loops -> 6e-05 secs
317-
5 loops -> 0.00015 secs
318-
10 loops -> 0.0003 secs
319-
20 loops -> 0.0006 secs
320-
50 loops -> 0.0015 secs
321-
100 loops -> 0.003 secs
322-
200 loops -> 0.006 secs
323-
500 loops -> 0.015 secs
324-
1000 loops -> 0.03 secs
325-
2000 loops -> 0.06 secs
326-
5000 loops -> 0.15 secs
327-
10000 loops -> 0.3 secs
315+
1 loop -> 3e-05 sec
316+
2 loops -> 6e-05 sec
317+
5 loops -> 0.00015 sec
318+
10 loops -> 0.0003 sec
319+
20 loops -> 0.0006 sec
320+
50 loops -> 0.0015 sec
321+
100 loops -> 0.003 sec
322+
200 loops -> 0.006 sec
323+
500 loops -> 0.015 sec
324+
1000 loops -> 0.03 sec
325+
2000 loops -> 0.06 sec
326+
5000 loops -> 0.15 sec
327+
10000 loops -> 0.3 sec
328328
329329
raw times: 300 msec, 300 msec, 300 msec, 300 msec, 300 msec
330330

Lib/timeit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def main(args=None, *, _wrap_timer=None):
319319
callback = None
320320
if verbose:
321321
def callback(number, time_taken):
322-
msg = "{num} loop{s} -> {secs:.{prec}g} secs"
322+
msg = "{num} loop{s} -> {secs:.{prec}g} sec"
323323
plural = (number != 1)
324324
print(msg.format(num=number, s='s' if plural else '',
325325
secs=time_taken, prec=precision))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Use singular "sec" instead of "secs" in :mod:`timeit` verbose output for
2+
consistency with other time units.

0 commit comments

Comments
 (0)