projects
/
python
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
deb925f
)
Issue #13300: Fix IDLE Restart Shell command failure introduced by
author
Ned Deily
<nad@acm.org>
Sun, 6 Nov 2011 05:36:44 +0000
(22:36 -0700)
committer
Ned Deily
<nad@acm.org>
Sun, 6 Nov 2011 05:36:44 +0000
(22:36 -0700)
3a5a0943b201
. Do not close listening socket on subprocess restart.
Lib/idlelib/PyShell.py
patch
|
blob
|
history
Lib/idlelib/rpc.py
patch
|
blob
|
history
diff --git
a/Lib/idlelib/PyShell.py
b/Lib/idlelib/PyShell.py
index 33deb457a4b92f16159f2eaa8f2ed634a3c69e84..ea3a5d9a8e1cd9e0c8b7de4eda3b3631f451a177 100644
(file)
--- 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 ddb36bde44084a7ce261263ee1b3203aab2832d6..def43945aee438aea98c3130e7ec98062c26b78d 100644
(file)
--- 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