Handle virtualenv and tox versions for py2.6/3.3

README.rst

@@ -1,7 +1,3 @@
-#Usage
-
-$ curl -s https://git.spectre5.com/adamcruz/speedtest-cli-pub/raw/branch/master/speedtest.py | python -
-
 speedtest-cli
 =============
 

speedtest.py

@@ -36,7 +36,7 @@ except ImportError:
     gzip = None
     GZIP_BASE = object
 
-__version__ = '2.0.2'
+__version__ = '2.0.1a'
 
 
 class FakeShutdownEvent(object):
@@ -85,9 +85,9 @@ except ImportError:
                                 HTTPErrorProcessor, OpenerDirector)
 
 try:
-    from httplib import HTTPConnection, BadStatusLine
+    from httplib import HTTPConnection
 except ImportError:
-    from http.client import HTTPConnection, BadStatusLine
+    from http.client import HTTPConnection
 
 try:
     from httplib import HTTPSConnection
@@ -266,13 +266,10 @@ try:
     except AttributeError:
         CERT_ERROR = tuple()
 
-    HTTP_ERRORS = (
+    HTTP_ERRORS = ((HTTPError, URLError, socket.error, ssl.SSLError) +
-        (HTTPError, URLError, socket.error, ssl.SSLError, BadStatusLine) +
+                   CERT_ERROR)
-        CERT_ERROR
-    )
 except ImportError:
-    ssl = None
+    HTTP_ERRORS = (HTTPError, URLError, socket.error)
-    HTTP_ERRORS = (HTTPError, URLError, socket.error, BadStatusLine)
 
 
 class SpeedtestException(Exception):
@@ -423,12 +420,14 @@ if HTTPSConnection:
         """
         def __init__(self, *args, **kwargs):
             source_address = kwargs.pop('source_address', None)
+            context = kwargs.pop('context', None)
             timeout = kwargs.pop('timeout', 10)
 
             HTTPSConnection.__init__(self, *args, **kwargs)
 
-            self.timeout = timeout
             self.source_address = source_address
+            self._context = context
+            self.timeout = timeout
 
         def connect(self):
             "Connect to a host on a given (SSL) port."
@@ -436,13 +435,9 @@ if HTTPSConnection:
             SpeedtestHTTPConnection.connect(self)
 
             kwargs = {}
-            if ssl:
+            if hasattr(ssl, 'SSLContext'):
-                if hasattr(ssl, 'SSLContext'):
+                kwargs['server_hostname'] = self.host
-                    kwargs['server_hostname'] = self.host
+                self.sock = self._context.wrap_socket(self.sock, **kwargs)
-                try:
-                    self.sock = self._context.wrap_socket(self.sock, **kwargs)
-                except AttributeError:
-                    self.sock = ssl.wrap_socket(self.sock, **kwargs)
 
 
 def _build_connection(connection, source_address, timeout, context=None):