walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

python24 travis issue diagnosis attempt

This commit is contained in:
Matt Martz 2015-05-15 10:34:52 -05:00
parent 51d0d88b96
commit 6366a8a172
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -5,15 +5,6 @@ python:
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: 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 add-apt-repository -y ppa:fkrull/deadsnakes; fi;

9
speedtest_cli.py
View File

@ -442,9 +442,12 @@ 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, e: # Python3 branch
root = DOM.parseString(''.join(serversxml)) try:
elements = root.getElementsByTagName('server') root = DOM.parseString(''.join(serversxml))
elements = root.getElementsByTagName('server')
except:
raise e
except SyntaxError: except SyntaxError:
raise SpeedtestCliServerListError raise SpeedtestCliServerListError
for server in elements: for server in elements: