From 1f315a9ef0d14de2899cb784182b08b871bff6a8 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sat, 1 Apr 2017 11:38:28 +0100 Subject: [PATCH] Fix except statements for Py2.5 compat --- deluge/ui/gtkui/connectionmanager.py | 4 ++-- deluge/ui/web/json_api.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 204b96033..faa2e8f55 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -206,7 +206,7 @@ class ConnectionManager(component.Component): try: gethostbyname(host) - except gaierror as ex: + except gaierror, ex: raise Exception("Host '%s': %s" % (host, ex.args[1])) # Host isn't in the list, so lets add it @@ -311,7 +311,7 @@ class ConnectionManager(component.Component): try: ip = gethostbyname(host) - except gaierror as ex: + except gaierror, ex: log.error("Error resolving host %s to ip: %s", host, ex.args[1]) continue diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 3be3f2a83..28e177df4 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -919,7 +919,7 @@ class WebApi(JSONComponent): try: gethostbyname(host) - except gaierror as ex: + except gaierror, ex: return (False, "Hostname error: %s" % ex.args[1]) try: