Issue #18518: timeit now rejects statements which can't be compiled outside
a function or a loop (e.g. "return" or "break").
This commit is contained in:
parent
21d7533c4c
commit
2bef58577f
|
@ -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
|
Create a :class:`Timer` instance with the given statement, *setup* code and
|
||||||
*timer* function and run its :meth:`.timeit` method with *number* executions.
|
*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)
|
.. function:: repeat(stmt='pass', setup='pass', timer=<default timer>, repeat=3, number=1000000)
|
||||||
|
|
||||||
|
|
|
@ -73,9 +73,21 @@ class TestTimeit(unittest.TestCase):
|
||||||
|
|
||||||
def test_timer_invalid_stmt(self):
|
def test_timer_invalid_stmt(self):
|
||||||
self.assertRaises(ValueError, timeit.Timer, stmt=None)
|
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):
|
def test_timer_invalid_setup(self):
|
||||||
self.assertRaises(ValueError, timeit.Timer, setup=None)
|
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_setup = "import timeit; timeit._fake_timer.setup()"
|
||||||
fake_stmt = "import timeit; timeit._fake_timer.inc()"
|
fake_stmt = "import timeit; timeit._fake_timer.inc()"
|
||||||
|
|
|
@ -109,6 +109,12 @@ class Timer:
|
||||||
self.timer = timer
|
self.timer = timer
|
||||||
ns = {}
|
ns = {}
|
||||||
if isinstance(stmt, str):
|
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)
|
stmt = reindent(stmt, 8)
|
||||||
if isinstance(setup, str):
|
if isinstance(setup, str):
|
||||||
setup = reindent(setup, 4)
|
setup = reindent(setup, 4)
|
||||||
|
|
|
@ -50,6 +50,9 @@ Core and Builtins
|
||||||
Library
|
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 #23094: Fixed readline with frames in Python implementation of pickle.
|
||||||
|
|
||||||
- Issue #23268: Fixed bugs in the comparison of ipaddress classes.
|
- Issue #23268: Fixed bugs in the comparison of ipaddress classes.
|
||||||
|
|
Loading…
Reference in New Issue