Mercurial > cpython-lru_cache-weakref

diff Lib/idlelib/PyShell.py @ 83049:240c83902fca 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#6698: IDLE now opens just an editor window when configured to do so.
author Roger Serwy <roger.serwy@gmail.com>
date Sun, 31 Mar 2013 23:28:55 -0500
parents 225022955c65
children 1e5e497ee33b
line wrap: on
line diff
--- 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")