From fe864f6dce881c4592a952df8db59745eff3fd7d Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 2 May 2017 11:08:22 -0500 Subject: [PATCH] Use vendored create_connection when socket doesn't have it, or socket.create_connection is too old --- speedtest.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/speedtest.py b/speedtest.py index 115b2f8..ad7dbb7 100755 --- a/speedtest.py +++ b/speedtest.py @@ -373,18 +373,20 @@ class SpeedtestHTTPConnection(HTTPConnection): self._context = context self.timeout = timeout - try: - self._create_connection = socket.create_connection - except AttributeError: - self._create_connection = create_connection - def connect(self): """Connect to the host and port specified in __init__.""" - self.sock = self._create_connection( - (self.host, self.port), - self.timeout, - self.source_address - ) + try: + self.sock = socket.create_connection( + (self.host, self.port), + self.timeout, + self.source_address + ) + except (AttributeError, TypeError): + self.sock = create_connection( + (self.host, self.port), + self.timeout, + self.source_address + ) if HTTPSConnection: