Show microseconds, milliseconds or seconds, whichever is most natural,

rather than showing weird numbers like 8.4e+03 usec.

diff --git a/Lib/timeit.py b/Lib/timeit.py
index 1127aaae40534eade1fa6d925480b33595db713d..7829395266623b0548e0595f9797084eddb8b1ea 100644 (file)
--- a/Lib/timeit.py
+++ b/Lib/timeit.py
@@ -264,7 +264,15 @@ def main(args=None):
         print "raw times:", " ".join(["%.*g" % (precision, x) for x in r])
     print "%d loops," % number,
     usec = best * 1e6 / number
-    print "best of %d: %.*g usec per loop" % (repeat, precision, usec)
+    if usec < 1000:
+        print "best of %d: %.*g usec per loop" % (repeat, precision, usec)
+    else:
+        msec = usec / 1000
+        if msec < 1000:
+            print "best of %d: %.*g msec per loop" % (repeat, precision, msec)
+        else:
+            sec = msec / 1000
+            print "best of %d: %.*g sec per loop" % (repeat, precision, sec)
     return None
 
 if __name__ == "__main__":