From: Kurt B. Kaiser <kbk@shore.net>
Date: Wed, 22 Sep 2004 04:52:33 +0000 (+0000)
Subject: There was an error in the Tk error dialog fix at Rev 1.81.4.3 which caused starting
X-Git-Tag: v2.3.5c1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b154dfce9797db2a671b2e5e1f2dfef9e0e74f3;p=thirdparty%2FPython%2Fcpython.git

There was an error in the Tk error dialog fix at Rev 1.81.4.3 which caused starting
w/o the subprocess to fail.  This is the same error in the 2.4 version which was
corrected at Rev 1.85, but missed in the backport!  Thanks to Hans Gubitz for noticing this.

M PyShell.py
---

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index d70ca5bc6acd..2e0009f625bf 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -926,7 +926,7 @@ class PyShell(OutputWindow):
             client = self.interp.start_subprocess()
             if not client:
                 self.close()
-                return None
+                return False
         else:
             nosub = "==== No Subprocess ===="
         self.write("Python %s on %s\n%s\n%s\nIDLE %s      %s\n" %
@@ -935,7 +935,7 @@ class PyShell(OutputWindow):
         self.showprompt()
         import Tkinter
         Tkinter._default_root = None # 03Jan04 KBK What's this?
-        return client
+        return True
 
     def readline(self):
         save = self.reading