Commit 22952a3e authored by Raymond Hettinger's avatar Raymond Hettinger

SF bug 735293: Command line timeit.py sets sys.path badly

Paul Moore's patch to have timeit.py check the current directory for
imports (instead of the directory for Lib/timeit.py).
parent 235d1efe
...@@ -236,6 +236,11 @@ def main(args=None): ...@@ -236,6 +236,11 @@ def main(args=None):
print __doc__, print __doc__,
return 0 return 0
setup = "\n".join(setup) or "pass" setup = "\n".join(setup) or "pass"
# Include the current directory, so that local imports work (sys.path
# contains the directory of this script, rather than the current
# directory)
import os
sys.path.insert(0, os.curdir)
t = Timer(stmt, setup, timer) t = Timer(stmt, setup, timer)
if number == 0: if number == 0:
# determine number so that 0.2 <= total time < 2.0 # determine number so that 0.2 <= total time < 2.0
......
...@@ -370,6 +370,7 @@ Trent Mick ...@@ -370,6 +370,7 @@ Trent Mick
Roman Milner Roman Milner
Dom Mitchell Dom Mitchell
Doug Moen Doug Moen
Paul Moore
The Dragon De Monsyne The Dragon De Monsyne
Skip Montanaro Skip Montanaro
James A Morrison James A Morrison
......
...@@ -58,6 +58,8 @@ Library ...@@ -58,6 +58,8 @@ Library
- Fixed socket speed loss caused by use of the _socketobject wrapper class - Fixed socket speed loss caused by use of the _socketobject wrapper class
in socket.py. in socket.py.
- timeit.py now checks the current directory for imports.
Tools/Demos Tools/Demos
----------- -----------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment