diff options
| author | Roger Serwy <roger.serwy@gmail.com> | 2013-04-01 04:31:32 (GMT) |
|---|---|---|
| committer | Roger Serwy <roger.serwy@gmail.com> | 2013-04-01 04:31:32 (GMT) |
| commit | af504ca017af63e5dc85f7053bf40c95a428785a (patch) | |
| tree | f4946f5c0ae933861b97615902622c3a151a8ede /Lib/idlelib/PyShell.py | |
| parent | 05bdd853eced8615b3529bc6672823411f83012a (diff) | |
| parent | c35151cf41eda485e40aadabbbfd61822bb157e8 (diff) | |
| download | cpython-af504ca017af63e5dc85f7053bf40c95a428785a.zip cpython-af504ca017af63e5dc85f7053bf40c95a428785a.tar.gz cpython-af504ca017af63e5dc85f7053bf40c95a428785a.tar.bz2 | |
#6698: merge with 3.3.
Diffstat (limited to 'Lib/idlelib/PyShell.py')
| -rw-r--r-- | Lib/idlelib/PyShell.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 6f50e34..b2a6305 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1413,7 +1413,7 @@ def main(): global flist, root, use_subprocess use_subprocess = True - enable_shell = True + enable_shell = False enable_edit = False debug = False cmd = None @@ -1434,7 +1434,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() @@ -1487,6 +1486,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") |