Compare commits
No commits in common. "master" and "no-globals" have entirely different histories.
master
...
no-globals
@ -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[456]|py3[123])") == 0 ]]; then pip install tox; fi;
|
||||
|
||||
|
||||
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") == 0 ]]; then pip install tox; fi;
|
||||
|
||||
script:
|
||||
- tox
|
||||
|
||||
10
README.rst
10
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
|
||||
=============
|
||||
|
||||
@ -11,9 +7,9 @@ speedtest.net
|
||||
.. image:: https://img.shields.io/pypi/v/speedtest-cli.svg
|
||||
:target: https://pypi.python.org/pypi/speedtest-cli/
|
||||
:alt: Latest Version
|
||||
.. image:: https://img.shields.io/travis/sivel/speedtest-cli.svg
|
||||
.. image:: https://img.shields.io/pypi/dm/speedtest-cli.svg
|
||||
:target: https://pypi.python.org/pypi/speedtest-cli/
|
||||
:alt: Travis
|
||||
:alt: Downloads
|
||||
.. image:: https://img.shields.io/pypi/l/speedtest-cli.svg
|
||||
:target: https://pypi.python.org/pypi/speedtest-cli/
|
||||
:alt: License
|
||||
@ -21,7 +17,7 @@ speedtest.net
|
||||
Versions
|
||||
--------
|
||||
|
||||
speedtest-cli works with Python 2.4-3.7
|
||||
speedtest-cli works with Python 2.4-3.6
|
||||
|
||||
.. image:: https://img.shields.io/pypi/pyversions/speedtest-cli.svg
|
||||
:target: https://pypi.python.org/pypi/speedtest-cli/
|
||||
|
||||
5
setup.py
5
setup.py
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2012-2018 Matt Martz
|
||||
# Copyright 2012-2016 Matt Martz
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
@ -66,7 +66,7 @@ setup(
|
||||
author_email='matt@sivel.net',
|
||||
url='https://github.com/sivel/speedtest-cli',
|
||||
license='Apache License, Version 2.0',
|
||||
py_modules=['speedtest'],
|
||||
py_modules=['speedtest', 'speedtest_cli'],
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'speedtest=speedtest:main',
|
||||
@ -91,6 +91,5 @@ setup(
|
||||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
]
|
||||
)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.TH "speedtest-cli" 1 "2018-01-05" "speedtest-cli"
|
||||
.TH "speedtest-cli" 1 "2014-04-23" "speedtest-cli"
|
||||
.SH NAME
|
||||
speedtest\-cli \- Command line interface for testing internet bandwidth using speedtest.net
|
||||
.SH SYNOPSIS
|
||||
@ -23,24 +23,14 @@ Displays usage for the tool.
|
||||
|
||||
.B Options
|
||||
|
||||
\fB\-\-no\-download\fR
|
||||
.RS
|
||||
Do not perform download test
|
||||
.RE
|
||||
|
||||
\fB\-\-no\-upload\fR
|
||||
.RS
|
||||
Do not perform upload test
|
||||
.RE
|
||||
|
||||
\fB\-\-bytes\fR
|
||||
.RS
|
||||
Display values in bytes instead of bits. Does not affect the image generated by \-\-share, nor output from \-\-json or \-\-csv
|
||||
Display values in bytes instead of bits. Does not affect the image generated by \-\-share
|
||||
.RE
|
||||
|
||||
\fB\-\-share\fR
|
||||
.RS
|
||||
Generate and provide a URL to the speedtest.net share results image, not displayed with \-\-csv
|
||||
Generate and provide a URL to the speedtest.net share results image
|
||||
.RE
|
||||
|
||||
\fB\-\-simple\fR
|
||||
@ -53,12 +43,12 @@ Suppress verbose output, only show basic information
|
||||
Suppress verbose output, only show basic information in CSV format. Speeds listed in bit/s and not affected by \-\-bytes
|
||||
.RE
|
||||
|
||||
\fB\-\-csv\-delimiter CSV_DELIMITER\fR
|
||||
\fB\-\-csv-delimiter CSV_DELIMITER\fR
|
||||
.RS
|
||||
Single character delimiter to use in CSV output. Default ","
|
||||
.RE
|
||||
|
||||
\fB\-\-csv\-header\fR
|
||||
\fB\-\-csv-header\fR
|
||||
.RS
|
||||
Print CSV headers
|
||||
.RE
|
||||
@ -75,12 +65,7 @@ Display a list of speedtest.net servers sorted by distance
|
||||
|
||||
\fB\-\-server SERVER\fR
|
||||
.RS
|
||||
Specify a server ID to test against. Can be supplied multiple times
|
||||
.RE
|
||||
|
||||
\fB\-\-exclude EXCLUDE\fR
|
||||
.RS
|
||||
Exclude a server from selection. Can be supplied multiple times
|
||||
Specify a server ID to test against
|
||||
.RE
|
||||
|
||||
\fB\-\-mini MINI\fR
|
||||
@ -103,11 +88,6 @@ HTTP timeout in seconds. Default 10
|
||||
Use HTTPS instead of HTTP when communicating with speedtest.net operated servers
|
||||
.RE
|
||||
|
||||
\fB\-\-no\-pre\-allocate\fR
|
||||
.RS
|
||||
Do not pre allocate upload data. Pre allocation is enabled by default to improve upload performance. To support systems with insufficient memory, use this option to avoid a MemoryError
|
||||
.RE
|
||||
|
||||
\fB\-\-version\fR
|
||||
.RS
|
||||
Show the version number and exit
|
||||
|
||||
125
speedtest.py
125
speedtest.py
@ -36,7 +36,7 @@ except ImportError:
|
||||
gzip = None
|
||||
GZIP_BASE = object
|
||||
|
||||
__version__ = '2.0.2'
|
||||
__version__ = '2.0.0a'
|
||||
|
||||
|
||||
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
|
||||
@ -166,14 +165,8 @@ except ImportError:
|
||||
self.flush()
|
||||
|
||||
_py3_print = getattr(builtins, 'print')
|
||||
try:
|
||||
_py3_utf8_stdout = _Py3Utf8Output(sys.stdout)
|
||||
_py3_utf8_stderr = _Py3Utf8Output(sys.stderr)
|
||||
except OSError:
|
||||
# sys.stdout/sys.stderr is not a compatible stdout/stderr object
|
||||
# just use it and hope things go ok
|
||||
_py3_utf8_stdout = sys.stdout
|
||||
_py3_utf8_stderr = sys.stderr
|
||||
_py3_utf8_stdout = _Py3Utf8Output(sys.stdout)
|
||||
_py3_utf8_stderr = _Py3Utf8Output(sys.stderr)
|
||||
|
||||
def to_utf8(v):
|
||||
"""No-op encode to utf-8 for py3"""
|
||||
@ -266,13 +259,10 @@ try:
|
||||
except AttributeError:
|
||||
CERT_ERROR = tuple()
|
||||
|
||||
HTTP_ERRORS = (
|
||||
(HTTPError, URLError, socket.error, ssl.SSLError, BadStatusLine) +
|
||||
CERT_ERROR
|
||||
)
|
||||
HTTP_ERRORS = ((HTTPError, URLError, socket.error, ssl.SSLError) +
|
||||
CERT_ERROR)
|
||||
except ImportError:
|
||||
ssl = None
|
||||
HTTP_ERRORS = (HTTPError, URLError, socket.error, BadStatusLine)
|
||||
HTTP_ERRORS = (HTTPError, URLError, socket.error)
|
||||
|
||||
|
||||
class SpeedtestException(Exception):
|
||||
@ -288,11 +278,7 @@ class SpeedtestHTTPError(SpeedtestException):
|
||||
|
||||
|
||||
class SpeedtestConfigError(SpeedtestException):
|
||||
"""Configuration XML is invalid"""
|
||||
|
||||
|
||||
class SpeedtestServersError(SpeedtestException):
|
||||
"""Servers XML is invalid"""
|
||||
"""Configuration provided is invalid"""
|
||||
|
||||
|
||||
class ConfigRetrievalError(SpeedtestHTTPError):
|
||||
@ -392,11 +378,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 +409,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'):
|
||||
kwargs['server_hostname'] = self.host
|
||||
try:
|
||||
self.sock = self._context.wrap_socket(self.sock, **kwargs)
|
||||
except AttributeError:
|
||||
self.sock = ssl.wrap_socket(self.sock, **kwargs)
|
||||
if hasattr(ssl, 'SSLContext'):
|
||||
kwargs['server_hostname'] = self.host
|
||||
|
||||
self.sock = self._context.wrap_socket(self.sock, **kwargs)
|
||||
|
||||
|
||||
def _build_connection(connection, source_address, timeout, context=None):
|
||||
@ -1060,16 +1036,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 +1053,10 @@ class Speedtest(object):
|
||||
if int(uh.code) != 200:
|
||||
return None
|
||||
|
||||
configxml = ''.encode().join(configxml_list)
|
||||
|
||||
printer('Config XML:\n%s' % configxml, debug=True)
|
||||
printer('Config XML:\n%s' % ''.encode().join(configxml), debug=True)
|
||||
|
||||
try:
|
||||
try:
|
||||
root = ET.fromstring(configxml)
|
||||
except ET.ParseError:
|
||||
e = get_exception()
|
||||
raise SpeedtestConfigError(
|
||||
'Malformed speedtest.net configuration: %s' % e
|
||||
)
|
||||
root = ET.fromstring(''.encode().join(configxml))
|
||||
server_config = root.find('server-config').attrib
|
||||
download = root.find('download').attrib
|
||||
upload = root.find('upload').attrib
|
||||
@ -1096,13 +1064,7 @@ class Speedtest(object):
|
||||
client = root.find('client').attrib
|
||||
|
||||
except AttributeError:
|
||||
try:
|
||||
root = DOM.parseString(configxml)
|
||||
except ExpatError:
|
||||
e = get_exception()
|
||||
raise SpeedtestConfigError(
|
||||
'Malformed speedtest.net configuration: %s' % e
|
||||
)
|
||||
root = DOM.parseString(''.join(configxml))
|
||||
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 +1113,7 @@ class Speedtest(object):
|
||||
'upload_max': upload_count * size_count
|
||||
})
|
||||
|
||||
try:
|
||||
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'))
|
||||
)
|
||||
self.lat_lon = (float(client['lat']), float(client['lon']))
|
||||
|
||||
printer('Config:\n%r' % self.config, debug=True)
|
||||
|
||||
@ -1211,13 +1167,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 +1182,15 @@ class Speedtest(object):
|
||||
if int(uh.code) != 200:
|
||||
raise ServersRetrievalError()
|
||||
|
||||
serversxml = ''.encode().join(serversxml_list)
|
||||
|
||||
printer('Servers XML:\n%s' % serversxml, debug=True)
|
||||
printer('Servers XML:\n%s' % ''.encode().join(serversxml),
|
||||
debug=True)
|
||||
|
||||
try:
|
||||
try:
|
||||
try:
|
||||
root = ET.fromstring(serversxml)
|
||||
except ET.ParseError:
|
||||
e = get_exception()
|
||||
raise SpeedtestServersError(
|
||||
'Malformed speedtest.net server list: %s' % e
|
||||
)
|
||||
root = ET.fromstring(''.encode().join(serversxml))
|
||||
elements = root.getiterator('server')
|
||||
except AttributeError:
|
||||
try:
|
||||
root = DOM.parseString(serversxml)
|
||||
except ExpatError:
|
||||
e = get_exception()
|
||||
raise SpeedtestServersError(
|
||||
'Malformed speedtest.net server list: %s' % e
|
||||
)
|
||||
root = DOM.parseString(''.join(serversxml))
|
||||
elements = root.getElementsByTagName('server')
|
||||
except (SyntaxError, xml.parsers.expat.ExpatError):
|
||||
raise ServersRetrievalError()
|
||||
@ -1710,10 +1653,7 @@ def printer(string, quiet=False, debug=False, error=False, **kwargs):
|
||||
return
|
||||
|
||||
if debug:
|
||||
if sys.stdout.isatty():
|
||||
out = '\033[1;30mDEBUG: %s\033[0m' % string
|
||||
else:
|
||||
out = 'DEBUG: %s' % string
|
||||
out = '\033[1;30mDEBUG: %s\033[0m' % string
|
||||
else:
|
||||
out = string
|
||||
|
||||
@ -1860,9 +1800,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 +1810,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:
|
||||
|
||||
34
speedtest_cli.py
Normal file
34
speedtest_cli.py
Normal file
@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2012-2016 Matt Martz
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import warnings
|
||||
|
||||
DEPRECATED_MSG = ('The file speedtest_cli.py has been deprecated in favor of '
|
||||
'speedtest.py\nand is available for download at:\n\n'
|
||||
'https://raw.githubusercontent.com/sivel/speedtest-cli/'
|
||||
'master/speedtest.py')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
raise SystemExit(DEPRECATED_MSG)
|
||||
else:
|
||||
try:
|
||||
from speedtest import *
|
||||
except ImportError:
|
||||
raise SystemExit(DEPRECATED_MSG)
|
||||
else:
|
||||
warnings.warn(DEPRECATED_MSG, UserWarning)
|
||||
Loading…
Reference in New Issue
Block a user