summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2020-11-20 08:26:07 (GMT)
committerGitHub <noreply@github.com>2020-11-20 08:26:07 (GMT)
commit03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0 (patch)
treee293c334cb6fee7b5826b21e26ab3c56a2d2fd20 /Lib/idlelib
parent7ddbaa7a1b3e61847ee99658be6a7268a049e302 (diff)
downloadcpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.zip
cpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.tar.gz
cpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.tar.bz2
bpo-42413: socket.timeout is now an alias of TimeoutError (GH-23413)
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/idlelib')
-rwxr-xr-xLib/idlelib/pyshell.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index b69916d..343d2ef 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -463,7 +463,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
self.rpcclt.listening_sock.settimeout(10)
try:
self.rpcclt.accept()
- except socket.timeout:
+ except TimeoutError:
self.display_no_subprocess_error()
return None
self.rpcclt.register("console", self.tkconsole)
@@ -498,7 +498,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
self.spawn_subprocess()
try:
self.rpcclt.accept()
- except socket.timeout:
+ except TimeoutError:
self.display_no_subprocess_error()
return None
self.transfer_path(with_cwd=with_cwd)