diff options
| author | Ned Deily <nad@acm.org> | 2011-11-06 05:36:44 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-11-06 05:36:44 (GMT) |
| commit | 55f87578a103e8da4b7c4211338bccc702bdba6e (patch) | |
| tree | 4ee774f63016e6a4eedbc9933530dd8327407315 /Lib/idlelib | |
| parent | deb925fc14fb12f9ef2a0773eb80ad81db7ec3ac (diff) | |
| download | cpython-55f87578a103e8da4b7c4211338bccc702bdba6e.zip cpython-55f87578a103e8da4b7c4211338bccc702bdba6e.tar.gz cpython-55f87578a103e8da4b7c4211338bccc702bdba6e.tar.bz2 | |
Issue #13300: Fix IDLE Restart Shell command failure introduced by
3a5a0943b201. Do not close listening socket on subprocess restart.
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/PyShell.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/rpc.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 33deb45..ea3a5d9 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -460,6 +460,10 @@ class ModifiedInterpreter(InteractiveInterpreter): def kill_subprocess(self): try: + self.rpcclt.listening_sock.close() + except AttributeError: # no socket + pass + try: self.rpcclt.close() except AttributeError: # no socket pass diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index ddb36bd..def4394 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 |