[Python-checkins] r50804 - python/trunk/Lib/idlelib/EditorWindow.py python/trunk/Lib/idlelib/NEWS.txt python/trunk/Lib/idlelib/PyShell.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Mon Jul 24 19:13:23 2006
New Revision: 50804

Modified:
   python/trunk/Lib/idlelib/EditorWindow.py
   python/trunk/Lib/idlelib/NEWS.txt
   python/trunk/Lib/idlelib/PyShell.py
Log:
EditorWindow failed when used stand-alone if sys.ps1 not set.
Bug 1010370 Dave Florek

M    EditorWindow.py
M    PyShell.py
M    NEWS.txt


Modified: python/trunk/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/trunk/Lib/idlelib/EditorWindow.py	(original)
+++ python/trunk/Lib/idlelib/EditorWindow.py	Mon Jul 24 19:13:23 2006
@@ -85,6 +85,10 @@
         self.flist = flist
         root = root or flist.root
         self.root = root
+        try:
+            sys.ps1
+        except AttributeError:
+            sys.ps1 = '>>> '
         self.menubar = Menu(root)
         self.top = top = WindowList.ListedToplevel(root, menu=self.menubar)
         if flist:

Modified: python/trunk/Lib/idlelib/NEWS.txt
==============================================================================
--- python/trunk/Lib/idlelib/NEWS.txt	(original)
+++ python/trunk/Lib/idlelib/NEWS.txt	Mon Jul 24 19:13:23 2006
@@ -3,6 +3,9 @@
 
 *Release date: XX-XXX-2006*
 
+- EditorWindow failed when used stand-alone if sys.ps1 not set.
+  Bug 1010370 Dave Florek
+
 - Tooltips failed on new-syle class __init__ args.  Bug 1027566 Loren Guthrie
 
 - Avoid occasional failure to detect closing paren properly.

Modified: python/trunk/Lib/idlelib/PyShell.py
==============================================================================
--- python/trunk/Lib/idlelib/PyShell.py	(original)
+++ python/trunk/Lib/idlelib/PyShell.py	Mon Jul 24 19:13:23 2006
@@ -1306,10 +1306,6 @@
     script = None
     startup = False
     try:
-        sys.ps1
-    except AttributeError:
-        sys.ps1 = '>>> '
-    try:
         opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
     except getopt.error, msg:
         sys.stderr.write("Error: %s\n" % str(msg))