[Python-checkins] cpython (3.3): #6698: IDLE now opens just an editor window when configured to do so.

[roger.serwy]

http://hg.python.org/cpython/rev/174caf4c901a
changeset:   83050:174caf4c901a
branch:      3.3
parent:      83045:61092bbd1464
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Sun Mar 31 23:28:55 2013 -0500
summary:
  #6698: IDLE now opens just an editor window when configured to do so.

files:
  Lib/idlelib/PyShell.py |  4 ++--
  Misc/NEWS              |  2 ++
  2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1409,7 +1409,7 @@
     global flist, root, use_subprocess
 
     use_subprocess = True
-    enable_shell = True
+    enable_shell = False
     enable_edit = False
     debug = False
     cmd = None
@@ -1430,7 +1430,6 @@
             enable_shell = True
         if o == '-e':
             enable_edit = True
-            enable_shell = False
         if o == '-h':
             sys.stdout.write(usage_msg)
             sys.exit()
@@ -1481,6 +1480,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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,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.
 

-- 
Repository URL: http://hg.python.org/cpython