From: Ned Deily <nad@acm.org>
Date: Sun, 6 Nov 2011 05:36:44 +0000 (-0700)
Subject: Issue #13300: Fix IDLE Restart Shell command failure introduced by
X-Git-Tag: v3.3.0a1~925
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55f87578a103e8da4b7c4211338bccc702bdba6e;p=thirdparty%2FPython%2Fcpython.git

Issue #13300: Fix IDLE Restart Shell command failure introduced by
3a5a0943b201.  Do not close listening socket on subprocess restart.
---

diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 33deb457a4b9..ea3a5d9a8e1c 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -459,6 +459,10 @@ class ModifiedInterpreter(InteractiveInterpreter):
         threading.Thread(target=self.__request_interrupt).start()
 
     def kill_subprocess(self):
+        try:
+            self.rpcclt.listening_sock.close()
+        except AttributeError:  # no socket
+            pass
         try:
             self.rpcclt.close()
         except AttributeError:  # no socket
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index ddb36bde4408..def43945aee4 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -534,10 +534,6 @@ class RPCClient(SocketIO):
     def get_remote_proxy(self, oid):
         return RPCProxy(self, oid)
 
-    def close(self):
-        self.listening_sock.close()
-        SocketIO.close(self)
-
 class RPCProxy(object):
 
     __methods = None