From 1e44e9e2f15efad0f157141da2e2da383896c551 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Sun, 17 May 2015 19:50:05 -0500 Subject: [PATCH] Always encode server info --- speedtest_cli.py | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/speedtest_cli.py b/speedtest_cli.py index c42d81e..ba0f38c 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -633,16 +633,7 @@ def speedtest(): line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) ' '[%(d)0.2f km]' % server) serverList.append(line) - # Python 2.7 and newer seem to be ok with the resultant encoding - # from parsing the XML, but older versions have some issues. - # This block should detect whether we need to encode or not - try: - unicode() - print_('\n'.join(serverList).encode('utf-8', 'ignore')) - except NameError: - print_('\n'.join(serverList)) - except IOError: - pass + print_('\n'.join(serverList).encode('utf-8', 'ignore')) sys.exit(0) else: servers = closestServers(config['client']) @@ -710,16 +701,8 @@ def speedtest(): best = getBestServer(servers) if not args.simple: - # Python 2.7 and newer seem to be ok with the resultant encoding - # from parsing the XML, but older versions have some issues. - # This block should detect whether we need to encode or not - try: - unicode() - print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' - '%(latency)s ms' % best).encode('utf-8', 'ignore')) - except NameError: - print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' - '%(latency)s ms' % best) + print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' + '%(latency)s ms' % best).encode('utf-8', 'ignore')) else: print_('Ping: %(latency)s ms' % best)