From 16746b775a003fed46ac6aa39dc47d8451e3606a Mon Sep 17 00:00:00 2001 From: minus Date: Fri, 12 May 2017 19:40:49 +0200 Subject: [PATCH] Fix except blocks using HTTP_ERRORS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The except blocks involving HTTP_ERRORS joined the exception types in a way that the types listed in HTTP_ERRORS appeared as a tuple, e.g. (ServersRetrievalError, (HTTPError, …)) --- speedtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/speedtest.py b/speedtest.py index 8b8526a..06a50a2 100755 --- a/speedtest.py +++ b/speedtest.py @@ -1395,14 +1395,14 @@ def shell(): printer('Retrieving speedtest.net configuration...', quiet) try: speedtest = Speedtest() - except (ConfigRetrievalError, HTTP_ERRORS): + except ((ConfigRetrievalError,) + HTTP_ERRORS): printer('Cannot retrieve speedtest configuration') raise SpeedtestCLIError(get_exception()) if args.list: try: speedtest.get_servers() - except (ServersRetrievalError, HTTP_ERRORS): + except ((ServersRetrievalError,) + HTTP_ERRORS): print_('Cannot retrieve speedtest server list') raise SpeedtestCLIError(get_exception()) @@ -1432,7 +1432,7 @@ def shell(): speedtest.get_servers(servers) except NoMatchedServers: raise SpeedtestCLIError('No matched servers: %s' % args.server) - except (ServersRetrievalError, HTTP_ERRORS): + except ((ServersRetrievalError,) + HTTP_ERRORS): print_('Cannot retrieve speedtest server list') raise SpeedtestCLIError(get_exception()) except InvalidServerIDType: