summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-04-01 04:28:55 (GMT)
committerRoger Serwy <roger.serwy@gmail.com>2013-04-01 04:28:55 (GMT)
commit34d0c66ef2bcfae00beb9f2b14e393cd00f499e4 (patch)
tree87a046af3d360a1d3f0d5ce8239d93f4dda6a067 /Lib
parentcadd7864d88239d7ed58611b28e8dc48ff70b49c (diff)
downloadcpython-34d0c66ef2bcfae00beb9f2b14e393cd00f499e4.zip
cpython-34d0c66ef2bcfae00beb9f2b14e393cd00f499e4.tar.gz
cpython-34d0c66ef2bcfae00beb9f2b14e393cd00f499e4.tar.bz2
#6698: IDLE now opens just an editor window when configured to do so.
Diffstat (limited to 'Lib')
-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 561993c..f2c9062 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1414,7 +1414,7 @@ def main():
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 @@ def main():
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 @@ 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")