.travis.yml

@@ -42,10 +42,7 @@ before_install:
 install:
   - if [[ $(echo "$TOXENV" | egrep -c "py32") != 0 ]]; then pip install setuptools==17.1.1; fi;
   - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
-  - if [[ $(echo "$TOXENV" | egrep -c "(py26|py33)") != 0 ]]; then pip install virtualenv==15.2.0 tox==2.9.1; fi;
+  - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") == 0 ]]; then pip install tox; fi;
-  - if [[ $(echo "$TOXENV" | egrep -c "(py2[456]|py3[123])") == 0 ]]; then pip install tox; fi;
-
-
 
 script:
   - tox

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.0'
 
 
 class FakeShutdownEvent(object):
@@ -70,7 +70,6 @@ except ImportError:
         import xml.etree.ElementTree as ET
     except ImportError:
         from xml.dom import minidom as DOM
-        from xml.parsers.expat import ExpatError
         ET = None
 
 try:
@@ -85,9 +84,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 +265,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):
@@ -288,11 +284,7 @@ class SpeedtestHTTPError(SpeedtestException):
 
 
 class SpeedtestConfigError(SpeedtestException):
-    """Configuration XML is invalid"""
+    """Configuration provided is invalid"""
-
-
-class SpeedtestServersError(SpeedtestException):
-    """Servers XML is invalid"""
 
 
 class ConfigRetrievalError(SpeedtestHTTPError):
@@ -392,11 +384,13 @@ class SpeedtestHTTPConnection(HTTPConnection):
     """
     def __init__(self, *args, **kwargs):
         source_address = kwargs.pop('source_address', None)
+        context = kwargs.pop('context', None)
         timeout = kwargs.pop('timeout', 10)
 
         HTTPConnection.__init__(self, *args, **kwargs)
 
         self.source_address = source_address
+        self._context = context
         self.timeout = timeout
 
     def connect(self):
@@ -421,28 +415,16 @@ if HTTPSConnection:
         """Custom HTTPSConnection to support source_address across
         Python 2.4 - Python 3
         """
-        def __init__(self, *args, **kwargs):
-            source_address = kwargs.pop('source_address', None)
-            timeout = kwargs.pop('timeout', 10)
-
-            HTTPSConnection.__init__(self, *args, **kwargs)
-
-            self.timeout = timeout
-            self.source_address = source_address
-
         def connect(self):
             "Connect to a host on a given (SSL) port."
 
             SpeedtestHTTPConnection.connect(self)
 
             kwargs = {}
-            if ssl:
+            if hasattr(ssl, 'SSLContext'):
-                if hasattr(ssl, 'SSLContext'):
+                kwargs['server_hostname'] = self.host
-                    kwargs['server_hostname'] = self.host
+
-                try:
+            self.sock = self._context.wrap_socket(self.sock, **kwargs)
-                    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):
@@ -1060,16 +1042,16 @@ class Speedtest(object):
         uh, e = catch_request(request, opener=self._opener)
         if e:
             raise ConfigRetrievalError(e)
-        configxml_list = []
+        configxml = []
 
         stream = get_response_stream(uh)
 
         while 1:
             try:
-                configxml_list.append(stream.read(1024))
+                configxml.append(stream.read(1024))
             except (OSError, EOFError):
                 raise ConfigRetrievalError(get_exception())
-            if len(configxml_list[-1]) == 0:
+            if len(configxml[-1]) == 0:
                 break
         stream.close()
         uh.close()
@@ -1077,18 +1059,10 @@ class Speedtest(object):
         if int(uh.code) != 200:
             return None
 
-        configxml = ''.encode().join(configxml_list)
+        printer('Config XML:\n%s' % ''.encode().join(configxml), debug=True)
-
-        printer('Config XML:\n%s' % configxml, debug=True)
 
         try:
-            try:
+            root = ET.fromstring(''.encode().join(configxml))
-                root = ET.fromstring(configxml)
-            except ET.ParseError:
-                e = get_exception()
-                raise SpeedtestConfigError(
-                    'Malformed speedtest.net configuration: %s' % e
-                )
             server_config = root.find('server-config').attrib
             download = root.find('download').attrib
             upload = root.find('upload').attrib
@@ -1096,13 +1070,7 @@ class Speedtest(object):
             client = root.find('client').attrib
 
         except AttributeError:
-            try:
+            root = DOM.parseString(''.join(configxml))
-                root = DOM.parseString(configxml)
-            except ExpatError:
-                e = get_exception()
-                raise SpeedtestConfigError(
-                    'Malformed speedtest.net configuration: %s' % e
-                )
             server_config = get_attributes_by_tag_name(root, 'server-config')
             download = get_attributes_by_tag_name(root, 'download')
             upload = get_attributes_by_tag_name(root, 'upload')
@@ -1151,13 +1119,7 @@ class Speedtest(object):
             'upload_max': upload_count * size_count
         })
 
-        try:
+        self.lat_lon = (float(client['lat']), float(client['lon']))
-            self.lat_lon = (float(client['lat']), float(client['lon']))
-        except ValueError:
-            raise SpeedtestConfigError(
-                'Unknown location: lat=%r lon=%r' %
-                (client.get('lat'), client.get('lon'))
-            )
 
         printer('Config:\n%r' % self.config, debug=True)
 
@@ -1211,13 +1173,13 @@ class Speedtest(object):
 
                 stream = get_response_stream(uh)
 
-                serversxml_list = []
+                serversxml = []
                 while 1:
                     try:
-                        serversxml_list.append(stream.read(1024))
+                        serversxml.append(stream.read(1024))
                     except (OSError, EOFError):
                         raise ServersRetrievalError(get_exception())
-                    if len(serversxml_list[-1]) == 0:
+                    if len(serversxml[-1]) == 0:
                         break
 
                 stream.close()
@@ -1226,28 +1188,15 @@ class Speedtest(object):
                 if int(uh.code) != 200:
                     raise ServersRetrievalError()
 
-                serversxml = ''.encode().join(serversxml_list)
+                printer('Servers XML:\n%s' % ''.encode().join(serversxml),
-
+                        debug=True)
-                printer('Servers XML:\n%s' % serversxml, debug=True)
 
                 try:
                     try:
-                        try:
+                        root = ET.fromstring(''.encode().join(serversxml))
-                            root = ET.fromstring(serversxml)
-                        except ET.ParseError:
-                            e = get_exception()
-                            raise SpeedtestServersError(
-                                'Malformed speedtest.net server list: %s' % e
-                            )
                         elements = root.getiterator('server')
                     except AttributeError:
-                        try:
+                        root = DOM.parseString(''.join(serversxml))
-                            root = DOM.parseString(serversxml)
-                        except ExpatError:
-                            e = get_exception()
-                            raise SpeedtestServersError(
-                                'Malformed speedtest.net server list: %s' % e
-                            )
                         elements = root.getElementsByTagName('server')
                 except (SyntaxError, xml.parsers.expat.ExpatError):
                     raise ServersRetrievalError()
@@ -1860,9 +1809,6 @@ def shell():
 
     printer('Results:\n%r' % results.dict(), debug=True)
 
-    if not args.simple and args.share:
-        results.share()
-
     if args.simple:
         printer('Ping: %s ms\nDownload: %0.2f M%s/s\nUpload: %0.2f M%s/s' %
                 (results.ping,
@@ -1873,6 +1819,8 @@ def shell():
     elif args.csv:
         printer(results.csv(delimiter=args.csv_delimiter))
     elif args.json:
+        if args.share:
+            results.share()
         printer(results.json())
 
     if args.share and not machine_format: