summaryrefslogtreecommitdiff
path: root/Lib/idlelib/PyShell.py
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-03-31 23:28:55 -0500
committerRoger Serwy <roger.serwy@gmail.com>2013-03-31 23:28:55 -0500
commitc35151cf41eda485e40aadabbbfd61822bb157e8 (patch)
treee7af85e4dc59ef6d0e267dc923ec1e8d382601c1 /Lib/idlelib/PyShell.py
parent420e2d8e39633448d40a25413bce55f6be482d6b (diff)
downloadcpython-git-c35151cf41eda485e40aadabbbfd61822bb157e8.tar.gz
#6698: IDLE now opens just an editor window when configured to do so.
Diffstat (limited to 'Lib/idlelib/PyShell.py')
-rw-r--r--Lib/idlelib/PyShell.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 78c4004fda..83449df75d 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1409,7 +1409,7 @@ def main():
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 @@ def main():
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 @@ def main():
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")