commit 03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0
author Christian Heimes <christian@python.org> Fri Nov 20 09:26:07 2020 +0100
committer GitHub <noreply@github.com> Fri Nov 20 00:26:07 2020 -0800
tree e293c334cb6fee7b5826b21e26ab3c56a2d2fd20
parent 7ddbaa7a1b3e61847ee99658be6a7268a049e302

bpo-42413: socket.timeout is now an alias of TimeoutError (GH-23413)



Signed-off-by: Christian Heimes <christian@python.org>

Lib/http/server.py

diff --git a/Lib/http/server.py b/Lib/http/server.py
index fa204fb..ee99182 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -414,7 +414,7 @@ def handle_one_request(self):
             method = getattr(self, mname)
             method()
             self.wfile.flush() #actually send the response if not already done.
-        except socket.timeout as e:
+        except TimeoutError as e:
             #a read or a write timed out.  Discard this connection
             self.log_error("Request timed out: %r", e)
             self.close_connection = True