diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 18:56:30 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 18:56:30 (GMT) |
| commit | cea7e55998d9e3c24c74fa55e59b252ac592d95e (patch) | |
| tree | b4b6ea88f89ad3161fffa8aa98e4f9ece4f42936 /Lib/timeit.py | |
| parent | afef78f832d0f2eab287f4ce889baf4d68a4fc63 (diff) | |
| download | cpython-cea7e55998d9e3c24c74fa55e59b252ac592d95e.zip cpython-cea7e55998d9e3c24c74fa55e59b252ac592d95e.tar.gz cpython-cea7e55998d9e3c24c74fa55e59b252ac592d95e.tar.bz2 | |
Merged revisions 83393,83396,83398,83404-83405,83408 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83393 | georg.brandl | 2010-08-01 10:35:29 +0200 (So, 01 Aug 2010) | 1 line
#1690103: fix initial namespace for code run with trace.main().
........
r83396 | georg.brandl | 2010-08-01 10:52:32 +0200 (So, 01 Aug 2010) | 1 line
#4810: document "--" option separator in timeit help.
........
r83398 | georg.brandl | 2010-08-01 11:06:34 +0200 (So, 01 Aug 2010) | 1 line
#8826: the "expires" attribute value is a date string with spaces, but apparently not all user-agents put it in quotes. Handle that as a special case.
........
r83404 | georg.brandl | 2010-08-01 16:25:22 +0200 (So, 01 Aug 2010) | 1 line
#6439: fix argument type for PySys_SetArgvEx() and Py_SetProgramName() in Demo/embed code.
........
r83405 | georg.brandl | 2010-08-01 16:38:17 +0200 (So, 01 Aug 2010) | 1 line
#4943: do not try to include drive letters (and colons) when looking for a probably module name.
........
r83408 | georg.brandl | 2010-08-01 17:30:56 +0200 (So, 01 Aug 2010) | 1 line
#5551: symbolic links never can be mount points. Fixes the fix for #1713.
........
Diffstat (limited to 'Lib/timeit.py')
| -rw-r--r-- | Lib/timeit.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/timeit.py b/Lib/timeit.py index 7b9b72c..c3f6753 100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -9,7 +9,7 @@ the Python Cookbook, published by O'Reilly. Library usage: see the Timer class. Command line usage: - python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-h] [statement] + python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-h] [--] [statement] Options: -n/--number N: how many times to execute 'statement' (default: see below) @@ -19,6 +19,7 @@ Options: -c/--clock: use time.clock() (default on Windows) -v/--verbose: print raw timing results; repeat for more digits precision -h/--help: print this usage message and exit + --: separate options from statement, use when statement starts with - statement: statement to be timed (default 'pass') A multi-line statement may be given by specifying each line as a |