diff options
author | Terry Jan Reedy <tjreedy@udel.edu> | 2012-01-31 07:42:19 (GMT) |
---|---|---|
committer | Terry Jan Reedy <tjreedy@udel.edu> | 2012-01-31 07:42:19 (GMT) |
commit | f8672bec683120d0cfc3ce4da63ecda9ae959532 (patch) | |
tree | b55735dc9081660f13ce489711a7cd9b8f11429e /Lib/idlelib/ScriptBinding.py | |
parent | cc6abd56b8197bac713ea8d70ac621e78f5aadd8 (diff) | |
parent | da4c46721066ee44843372e8bf57c6c81dec8e4a (diff) | |
download | cpython-f8672bec683120d0cfc3ce4da63ecda9ae959532.zip cpython-f8672bec683120d0cfc3ce4da63ecda9ae959532.tar.gz cpython-f8672bec683120d0cfc3ce4da63ecda9ae959532.tar.bz2 |
Merge 3.2
- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.
Original patches by Marco Scataglini and Roger Serwy.
Merge 3.2 #13506 Add '' to path for interactive interpreter by adding with_cwd
parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed.
Original patches by Marco Scataglini and Roger Serwy.
Diffstat (limited to 'Lib/idlelib/ScriptBinding.py')
-rw-r--r-- | Lib/idlelib/ScriptBinding.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py index 26becce..18ce965 100644 --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -144,10 +144,9 @@ class ScriptBinding: return 'break' if not self.tabnanny(filename): return 'break' - shell = self.shell - interp = shell.interp + interp = self.shell.interp if PyShell.use_subprocess: - shell.restart_shell() + interp.restart_subprocess(with_cwd=False) dirname = os.path.dirname(filename) # XXX Too often this discards arguments the user just set... interp.runcommand("""if 1: |