Merge 3b8ddb5ea2
into 7b09d8759f
This commit is contained in:
commit
98fe7a5591
|
@ -18,7 +18,6 @@ env:
|
||||||
- TOXENV=py25
|
- TOXENV=py25
|
||||||
- TOXENV=py26
|
- TOXENV=py26
|
||||||
- TOXENV=py27
|
- TOXENV=py27
|
||||||
- TOXENV=py32
|
|
||||||
- TOXENV=py33
|
- TOXENV=py33
|
||||||
- TOXENV=py34
|
- TOXENV=py34
|
||||||
- TOXENV=pypy
|
- TOXENV=pypy
|
||||||
|
|
|
@ -445,7 +445,7 @@ def closestServers(client, all=False):
|
||||||
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: # Python3 branch
|
||||||
root = DOM.parseString(''.join(serversxml))
|
root = DOM.parseString(''.encode().join(serversxml))
|
||||||
elements = root.getElementsByTagName('server')
|
elements = root.getElementsByTagName('server')
|
||||||
except SyntaxError:
|
except SyntaxError:
|
||||||
raise SpeedtestCliServerListError
|
raise SpeedtestCliServerListError
|
||||||
|
@ -641,7 +641,8 @@ def speedtest():
|
||||||
servers = closestServers(config['client'])
|
servers = closestServers(config['client'])
|
||||||
|
|
||||||
if not args.simple:
|
if not args.simple:
|
||||||
print_('Testing from %(isp)s (%(ip)s)...' % config['client'])
|
print_(('Testing from %(isp)s (%(ip)s)...'
|
||||||
|
% config['client']).encode('utf-8', 'ignore'))
|
||||||
|
|
||||||
if args.server:
|
if args.server:
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue