changeset: 83049:240c83902fca branch: 2.7 parent: 83044:37352a3ccd54 user: Roger Serwy date: Sun Mar 31 23:28:55 2013 -0500 files: Lib/idlelib/PyShell.py Misc/NEWS description: #6698: IDLE now opens just an editor window when configured to do so. diff -r 37352a3ccd54 -r 240c83902fca Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py Sun Mar 31 15:53:08 2013 -0500 +++ b/Lib/idlelib/PyShell.py Sun Mar 31 23:28:55 2013 -0500 @@ -1414,7 +1414,7 @@ global flist, root, use_subprocess use_subprocess = True - enable_shell = True + enable_shell = False enable_edit = False debug = False cmd = None @@ -1435,7 +1435,6 @@ enable_shell = True if o == '-e': enable_edit = True - enable_shell = False if o == '-h': sys.stdout.write(usage_msg) sys.exit() @@ -1486,6 +1485,7 @@ edit_start = idleConf.GetOption('main', 'General', 'editor-on-startup', type='bool') enable_edit = enable_edit or edit_start + enable_shell = enable_shell or not enable_edit # start editor and/or shell windows: root = Tk(className="Idle") diff -r 37352a3ccd54 -r 240c83902fca Misc/NEWS --- a/Misc/NEWS Sun Mar 31 15:53:08 2013 -0500 +++ b/Misc/NEWS Sun Mar 31 23:28:55 2013 -0500 @@ -12,6 +12,8 @@ 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 raises an exception.