[Python-checkins] r74437 - python/branches/tk_and_idle_maintenance/Lib/idlelib/PyShell.py

[guilherme.polo]

Author: guilherme.polo
Date: Fri Aug 14 00:04:08 2009
New Revision: 74437

Log:
Revert part of r71126.

Modified:
   python/branches/tk_and_idle_maintenance/Lib/idlelib/PyShell.py

Modified: python/branches/tk_and_idle_maintenance/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/tk_and_idle_maintenance/Lib/idlelib/PyShell.py	(original)
+++ python/branches/tk_and_idle_maintenance/Lib/idlelib/PyShell.py	Fri Aug 14 00:04:08 2009
@@ -1355,7 +1355,7 @@
     global flist, root, use_subprocess
 
     use_subprocess = True
-    enable_shell = True
+    enable_shell = False
     enable_edit = False
     debug = False
     cmd = None
@@ -1376,7 +1376,6 @@
             enable_shell = True
         if o == '-e':
             enable_edit = True
-            enable_shell = False
         if o == '-h':
             sys.stdout.write(usage_msg)
             sys.exit()
@@ -1427,6 +1426,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 edit_start
     # start editor and/or shell windows:
     root = Tk(className="Idle")