net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

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