Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Matt Martz | 1ed6aba90c | |
Matt Martz | 9b9e5f0fe3 | |
Matt Martz | a595b89eb9 | |
Matt Martz | 6366a8a172 |
29
.travis.yml
29
.travis.yml
|
@ -3,26 +3,19 @@ language: python
|
||||||
python:
|
python:
|
||||||
- 2.7
|
- 2.7
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- deadsnakes
|
||||||
|
packages:
|
||||||
|
- python2.4
|
||||||
|
- python2.5
|
||||||
|
- python2.6
|
||||||
|
- python3.1
|
||||||
|
- pypy
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- TOXENV=py24
|
- TOXENV=py24
|
||||||
- TOXENV=py25
|
|
||||||
- TOXENV=py26
|
|
||||||
- TOXENV=py27
|
|
||||||
- TOXENV=py31
|
|
||||||
- TOXENV=py32
|
|
||||||
- TOXENV=py33
|
|
||||||
- TOXENV=py34
|
|
||||||
- TOXENV=pypy
|
|
||||||
- TOXENV=flake8
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[14])") != 0 ]]; then sudo add-apt-repository -y ppa:fkrull/deadsnakes; fi;
|
|
||||||
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[14])") != 0 ]]; then sudo apt-get update -qq; fi;
|
|
||||||
- if [[ "$TOXENV" == "py24" ]]; then sudo apt-get install -y python2.4; fi;
|
|
||||||
- if [[ "$TOXENV" == "py25" ]]; then sudo apt-get install -y python2.5; fi;
|
|
||||||
- if [[ "$TOXENV" == "py31" ]]; then sudo apt-get install -y python3.1; fi;
|
|
||||||
- if [[ "$TOXENV" == "py34" ]]; then sudo apt-get install -y python3.4; fi;
|
|
||||||
- if [[ "$TOXENV" == "pypy" ]]; then sudo apt-get install -y pypy; fi;
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
|
- if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py31)") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
|
||||||
|
|
|
@ -375,7 +375,7 @@ def getConfig():
|
||||||
we are interested in
|
we are interested in
|
||||||
"""
|
"""
|
||||||
|
|
||||||
request = build_request('://www.speedtest.net/speedtest-config.php')
|
request = build_request('://c.speedtest.net/speedtest-config.php')
|
||||||
uh, e = catch_request(request)
|
uh, e = catch_request(request)
|
||||||
if e:
|
if e:
|
||||||
print_('Could not retrieve speedtest.net configuration: %s' % e)
|
print_('Could not retrieve speedtest.net configuration: %s' % e)
|
||||||
|
@ -396,7 +396,7 @@ def getConfig():
|
||||||
'times': root.find('times').attrib,
|
'times': root.find('times').attrib,
|
||||||
'download': root.find('download').attrib,
|
'download': root.find('download').attrib,
|
||||||
'upload': root.find('upload').attrib}
|
'upload': root.find('upload').attrib}
|
||||||
except AttributeError: # Python3 branch
|
except AttributeError: # Python2.4 branch
|
||||||
root = DOM.parseString(''.join(configxml))
|
root = DOM.parseString(''.join(configxml))
|
||||||
config = {
|
config = {
|
||||||
'client': getAttributesByTagName(root, 'client'),
|
'client': getAttributesByTagName(root, 'client'),
|
||||||
|
@ -442,9 +442,13 @@ def closestServers(client, all=False):
|
||||||
try:
|
try:
|
||||||
root = ET.fromstring(''.encode().join(serversxml))
|
root = ET.fromstring(''.encode().join(serversxml))
|
||||||
elements = root.getiterator('server')
|
elements = root.getiterator('server')
|
||||||
except AttributeError: # Python3 branch
|
except AttributeError: # Python2.4 branch
|
||||||
root = DOM.parseString(''.join(serversxml))
|
try:
|
||||||
elements = root.getElementsByTagName('server')
|
root = DOM.parseString(''.join(serversxml))
|
||||||
|
elements = root.getElementsByTagName('server')
|
||||||
|
except:
|
||||||
|
print_('---%s---' % serversxml)
|
||||||
|
print_('---%s---' % ''.join(serversxml))
|
||||||
except SyntaxError:
|
except SyntaxError:
|
||||||
raise SpeedtestCliServerListError
|
raise SpeedtestCliServerListError
|
||||||
for server in elements:
|
for server in elements:
|
||||||
|
|
Loading…
Reference in New Issue