summaryrefslogtreecommitdiff
path: root/Lib/timeit.py
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2015-04-21 19:44:54 -0400
committerAndrew Kuchling <amk@amk.ca>2015-04-21 19:44:54 -0400
commitc3a7f181008fef91b5a5977b370271ce3f7f75b0 (patch)
tree3f947ad707143366d1c0eab35da15e7a43e4eb9d /Lib/timeit.py
parentf5e8540e1bda85f041fc7ce592e3079c16f18a1b (diff)
parent333518e01df0ce011962ca8629e766a59316e1cb (diff)
downloadcpython-git-c3a7f181008fef91b5a5977b370271ce3f7f75b0.tar.gz
Merge from 3.4
Diffstat (limited to 'Lib/timeit.py')
-rwxr-xr-xLib/timeit.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/timeit.py b/Lib/timeit.py
index caa7da3391..de7d5505e4 100755
--- a/Lib/timeit.py
+++ b/Lib/timeit.py
@@ -14,7 +14,8 @@ Command line usage:
Options:
-n/--number N: how many times to execute 'statement' (default: see below)
-r/--repeat N: how many times to repeat the timer (default 3)
- -s/--setup S: statement to be executed once initially (default 'pass')
+ -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)