EditorWindow failed when used stand-alone if sys.ps1 not set.

Bug 1010370 Dave Florek

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

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 442d7187f5271494b426281a0ecbed75a9d76ec3..397d12e0e9391155e268234383da23f1523c22dc 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -85,6 +85,10 @@ class EditorWindow(object):
         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:

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 5ea5b0e70271e6d830fc5166f2d457537a26fcb1..ba624e57d0ac20e4150721feb69d174c7f9327d7 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,9 @@ What's New in IDLE 1.2c1?
 
 *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.

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index f7622f14f9a0e5a430c6b7f86080fec861f15129..227372ef2a7c7d9837f9483e3eac94ec8a34ea44 100644 (file)
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1305,10 +1305,6 @@ def main():
     cmd = None
     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: