[Python-checkins] cpython (3.4): Issue #18518: timeit now rejects statements which can't be compiled outside

Mon Jan 26 11:15:31 CET 2015

https://hg.python.org/cpython/rev/a5769fa55791
changeset: 94304:a5769fa55791
branch: 3.4
parent: 94296:d5e13b74d377
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Jan 26 12:09:17 2015 +0200
summary:
 Issue #18518: timeit now rejects statements which can't be compiled outside
a function or a loop (e.g. "return" or "break").
files:
 Doc/library/timeit.rst | 6 ------
 Lib/test/test_timeit.py | 12 ++++++++++++
 Lib/timeit.py | 6 ++++++
 Misc/NEWS | 3 +++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -64,12 +64,6 @@
 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)
 
diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py
--- a/Lib/test/test_timeit.py
+++ b/Lib/test/test_timeit.py
@@ -73,9 +73,21 @@
 
 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()"
diff --git a/Lib/timeit.py b/Lib/timeit.py
--- a/Lib/timeit.py
+++ b/Lib/timeit.py
@@ -109,6 +109,12 @@
 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)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@
 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.
-- 
Repository URL: https://hg.python.org/cpython
