Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#6698: merge with 3.3.

This commit is contained in:
Roger Serwy 2013-03-31 23:31:32 -05:00
parent 05bdd853ec c35151cf41
commit af504ca017
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/idlelib/PyShell.py
View File

@ -1413,7 +1413,7 @@ def main():
global flist, root, use_subprocess global flist, root, use_subprocess
use_subprocess = True use_subprocess = True
enable_shell = True enable_shell = False
enable_edit = False enable_edit = False
debug = False debug = False
cmd = None cmd = None
@ -1434,7 +1434,6 @@ def main():
enable_shell = True enable_shell = True
if o == '-e': if o == '-e':
enable_edit = True enable_edit = True
enable_shell = False
if o == '-h': if o == '-h':
sys.stdout.write(usage_msg) sys.stdout.write(usage_msg)
sys.exit() sys.exit()
@ -1487,6 +1486,7 @@ def main():
edit_start = idleConf.GetOption('main', 'General', edit_start = idleConf.GetOption('main', 'General',
'editor-on-startup', type='bool') 'editor-on-startup', type='bool')
enable_edit = enable_edit or edit_start enable_edit = enable_edit or edit_start
enable_shell = enable_shell or not enable_edit
# start editor and/or shell windows: # start editor and/or shell windows:
root = Tk(className="Idle") root = Tk(className="Idle")

2
Misc/NEWS
View File

@ -297,6 +297,8 @@ Core and Builtins
Library Library
------- -------
- Issue #6698: IDLE now opens just an editor window when configured to do so.
- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
raises an exception. raises an exception.