Issue #24631: Fixed regression in the timeit modulu with multyline setup.
This commit is contained in:
parent
76d508b5d4
commit
ced770da07
|
@ -88,8 +88,8 @@ class TestTimeit(unittest.TestCase):
|
|||
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()"
|
||||
fake_setup = "import timeit\ntimeit._fake_timer.setup()"
|
||||
fake_stmt = "import timeit\ntimeit._fake_timer.inc()"
|
||||
|
||||
def fake_callable_setup(self):
|
||||
self.fake_timer.setup()
|
||||
|
@ -272,6 +272,12 @@ class TestTimeit(unittest.TestCase):
|
|||
self.assertEqual(s, "CustomSetup\n" * 3 +
|
||||
"35 loops, best of 3: 2 sec per loop\n")
|
||||
|
||||
def test_main_multiple_setups(self):
|
||||
s = self.run_main(seconds_per_increment=2.0,
|
||||
switches=['-n35', '-s', 'a = "CustomSetup"', '-s', 'print(a)'])
|
||||
self.assertEqual(s, "CustomSetup\n" * 3 +
|
||||
"35 loops, best of 3: 2 sec per loop\n")
|
||||
|
||||
def test_main_fixed_reps(self):
|
||||
s = self.run_main(seconds_per_increment=60.0, switches=['-r9'])
|
||||
self.assertEqual(s, "10 loops, best of 9: 60 sec per loop\n")
|
||||
|
|
|
@ -109,19 +109,18 @@ class Timer:
|
|||
if isinstance(setup, str):
|
||||
# Check that the code can be compiled outside a function
|
||||
compile(setup, dummy_src_name, "exec")
|
||||
stmtprefix = setup + '\n'
|
||||
setup = reindent(setup, 4)
|
||||
elif callable(setup):
|
||||
local_ns['_setup'] = setup
|
||||
init += ', _setup=_setup'
|
||||
stmtprefix = ''
|
||||
setup = '_setup()'
|
||||
else:
|
||||
raise ValueError("setup is neither a string nor callable")
|
||||
if isinstance(stmt, str):
|
||||
# Check that the code can be compiled outside a function
|
||||
if isinstance(setup, str):
|
||||
compile(setup + '\n' + stmt, dummy_src_name, "exec")
|
||||
else:
|
||||
compile(stmt, dummy_src_name, "exec")
|
||||
compile(stmtprefix + stmt, dummy_src_name, "exec")
|
||||
stmt = reindent(stmt, 8)
|
||||
elif callable(stmt):
|
||||
local_ns['_stmt'] = stmt
|
||||
|
|
Loading…
Reference in New Issue