changeset: 83051:ee5806d231db
parent: 83048:18e699c4d8c0
parent: 83050:174caf4c901a
user: Roger Serwy <roger.serwy@gmail.com>
date: Sun Mar 31 23:31:32 2013 -0500
files: Lib/idlelib/PyShell.py Misc/NEWS
description:
#6698: merge with 3.3.
diff -r 18e699c4d8c0 -r ee5806d231db Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py	Sun Mar 31 17:06:15 2013 -0700
+++ b/Lib/idlelib/PyShell.py	Sun Mar 31 23:31:32 2013 -0500
@@ -1413,7 +1413,7 @@
 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 @@
 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 @@
 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")
 
diff -r 18e699c4d8c0 -r ee5806d231db Misc/NEWS
--- a/Misc/NEWS	Sun Mar 31 17:06:15 2013 -0700
+++ b/Misc/NEWS	Sun Mar 31 23:31:32 2013 -0500
@@ -297,6 +297,8 @@
 Library
 -------
 
+- Issue #6698: IDLE now opens just an editor window when configured to do so.
+
 - Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer 
 raises an exception.
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/ee5806d231db">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/ee5806d231db" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>