diff options
| author | Christian Heimes <christian@python.org> | 2020-11-20 08:26:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 08:26:07 (GMT) |
| commit | 03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0 (patch) | |
| tree | e293c334cb6fee7b5826b21e26ab3c56a2d2fd20 /Lib/test/test_ssl.py | |
| parent | 7ddbaa7a1b3e61847ee99658be6a7268a049e302 (diff) | |
| download | cpython-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/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 8744e59..e5cd962 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -2574,7 +2574,7 @@ class ThreadedEchoServer(threading.Thread): handler = self.ConnectionHandler(self, newconn, connaddr) handler.start() handler.join() - except socket.timeout: + except TimeoutError: pass except KeyboardInterrupt: self.stop() @@ -3691,7 +3691,7 @@ class ThreadedTests(unittest.TestCase): c.settimeout(0.2) c.connect((host, port)) # Will attempt handshake and time out - self.assertRaisesRegex(socket.timeout, "timed out", + self.assertRaisesRegex(TimeoutError, "timed out", test_wrap_socket, c) finally: c.close() @@ -3700,7 +3700,7 @@ class ThreadedTests(unittest.TestCase): c = test_wrap_socket(c) c.settimeout(0.2) # Will attempt handshake and time out - self.assertRaisesRegex(socket.timeout, "timed out", + self.assertRaisesRegex(TimeoutError, "timed out", c.connect, (host, port)) finally: c.close() |