From 35eeb30adf4e01fa20cd95da1e4d4f80a4d1cd1d Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola' Date: Mon, 15 Oct 2012 16:57:37 +0200 Subject: [PATCH] logging's SocketHandler: get rid of some legacy code and use the newer socket.create_connection() utility function --- Lib/logging/handlers.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 2c5a634740..fbc59fac3c 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -496,15 +496,7 @@ class SocketHandler(logging.Handler): A factory method which allows subclasses to define the precise type of socket they want. """ - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if hasattr(s, 'settimeout'): - s.settimeout(timeout) - try: - s.connect((self.host, self.port)) - return s - except socket.error: - s.close() - raise + return socket.create_connection((self.host, self.port), timeout=timeout) def createSocket(self): """ -- 2.50.1