You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-uni...

37 lines
1.2 KiB

diff --git a/speedtest_cli.py b/speedtest_cli.py
index d93d5c3..930e42b 100755
--- a/speedtest_cli.py
+++ b/speedtest_cli.py
@@ -108,6 +108,8 @@ except ImportError:
def write(data):
if not isinstance(data, basestring):
data = str(data)
+ if isinstance(data, unicode):
+ data = data.encode('utf-8', 'ignore')
fp.write(data)
want_unicode = False
@@ -635,7 +637,7 @@ def speedtest():
line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) '
'[%(d)0.2f km]' % server)
serverList.append(line)
- print_('\n'.join(serverList).encode('utf-8', 'ignore'))
+ print_('\n'.join(serverList))
sys.exit(0)
else:
servers = closestServers(config['client'])
@@ -703,8 +705,8 @@ def speedtest():
best = getBestServer(servers)
if not args.simple:
- print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
- '%(latency)s ms' % best).encode('utf-8', 'ignore'))
+ print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
+ '%(latency)s ms' % best)
else:
print_('Ping: %(latency)s ms' % best)
--
2.7.1