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:53:43 -05:00
parent 6366a8a172
commit a595b89eb9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
speedtest_cli.py
View File

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