Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2bef5857
Commit
2bef5857
authored
Jan 26, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #18518: timeit now rejects statements which can't be compiled outside
a function or a loop (e.g. "return" or "break").
parent
21d7533c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
6 deletions
+21
-6
Doc/library/timeit.rst
Doc/library/timeit.rst
+0
-6
Lib/test/test_timeit.py
Lib/test/test_timeit.py
+12
-0
Lib/timeit.py
Lib/timeit.py
+6
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Doc/library/timeit.rst
View file @
2bef5857
...
...
@@ -64,12 +64,6 @@ The module defines three convenience functions and a public class:
Create a :class:`Timer` instance with the given statement, *setup* code and
*timer* function and run its :meth:`.timeit` method with *number* executions.
.. note::
Because :meth:`.timeit` is executing *stmt*, placing a return statement
in *stmt* will prevent :meth:`.timeit` from returning execution time.
It will instead return the data specified by your return statement.
.. function:: repeat(stmt='pass', setup='pass', timer=<default timer>, repeat=3, number=1000000)
...
...
Lib/test/test_timeit.py
View file @
2bef5857
...
...
@@ -73,9 +73,21 @@ class TestTimeit(unittest.TestCase):
def
test_timer_invalid_stmt
(
self
):
self
.
assertRaises
(
ValueError
,
timeit
.
Timer
,
stmt
=
None
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'return'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'yield'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'yield from ()'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'break'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'continue'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
stmt
=
'from timeit import *'
)
def
test_timer_invalid_setup
(
self
):
self
.
assertRaises
(
ValueError
,
timeit
.
Timer
,
setup
=
None
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'return'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'yield'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'yield from ()'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'break'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'continue'
)
self
.
assertRaises
(
SyntaxError
,
timeit
.
Timer
,
setup
=
'from timeit import *'
)
fake_setup
=
"import timeit; timeit._fake_timer.setup()"
fake_stmt
=
"import timeit; timeit._fake_timer.inc()"
...
...
Lib/timeit.py
View file @
2bef5857
...
...
@@ -109,6 +109,12 @@ class Timer:
self
.
timer
=
timer
ns
=
{}
if
isinstance
(
stmt
,
str
):
# Check that the code can be compiled outside a function
if
isinstance
(
setup
,
str
):
compile
(
setup
,
dummy_src_name
,
"exec"
)
compile
(
setup
+
'
\
n
'
+
stmt
,
dummy_src_name
,
"exec"
)
else
:
compile
(
stmt
,
dummy_src_name
,
"exec"
)
stmt
=
reindent
(
stmt
,
8
)
if
isinstance
(
setup
,
str
):
setup
=
reindent
(
setup
,
4
)
...
...
Misc/NEWS
View file @
2bef5857
...
...
@@ -50,6 +50,9 @@ Core and Builtins
Library
-------
- Issue #18518: timeit now rejects statements which can'
t
be
compiled
outside
a
function
or
a
loop
(
e
.
g
.
"return"
or
"break"
).
-
Issue
#
23094
:
Fixed
readline
with
frames
in
Python
implementation
of
pickle
.
-
Issue
#
23268
:
Fixed
bugs
in
the
comparison
of
ipaddress
classes
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment