diff --git a/.travis.yml b/.travis.yml index ddaa43b..02bc2dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,6 @@ python: env: - 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; diff --git a/speedtest_cli.py b/speedtest_cli.py index c42d81e..a37014b 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -442,9 +442,12 @@ def closestServers(client, all=False): try: root = ET.fromstring(''.encode().join(serversxml)) elements = root.getiterator('server') - except AttributeError: # Python3 branch - root = DOM.parseString(''.join(serversxml)) - elements = root.getElementsByTagName('server') + except AttributeError, e: # Python3 branch + try: + root = DOM.parseString(''.join(serversxml)) + elements = root.getElementsByTagName('server') + except: + raise e except SyntaxError: raise SpeedtestCliServerListError for server in elements: