From d0428979d8cb60c6b99ec38a9a24981ae2e5b553 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 28 May 2017 16:32:16 +0200 Subject: mirrorresolv: Make exception Python 3 friendly --- mirrors/management/commands/mirrorresolv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py index 0e71894b..d0f9bc1c 100644 --- a/mirrors/management/commands/mirrorresolv.py +++ b/mirrors/management/commands/mirrorresolv.py @@ -54,12 +54,12 @@ def resolve_mirrors(): if newvals != oldvals: logger.debug("values changed for %s", mirrorurl) mirrorurl.save(update_fields=('has_ipv4', 'has_ipv6')) - except socket.gaierror, e: + except socket.gaierror as e: if e.errno == socket.EAI_NONAME: logger.debug("gaierror resolving %s: %s", mirrorurl.hostname, e) else: logger.warn("gaierror resolving %s: %s", mirrorurl.hostname, e) - except socket.error, e: + except socket.error as e: logger.warn("error resolving %s: %s", mirrorurl.hostname, e) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-55-g3dc8 From 3d1a8302bae53e200cb2b8fc73ae2117b0d1c088 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 28 May 2017 16:45:06 +0200 Subject: Make print statements Python 3 compatible --- packages/alpm.py | 6 +++--- urls.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/alpm.py b/packages/alpm.py index 3762ea68..a2efd619 100644 --- a/packages/alpm.py +++ b/packages/alpm.py @@ -64,9 +64,9 @@ class AlpmAPI(object): def main(): api = AlpmAPI() - print api.version() - print api.vercmp(1, 2) - print api.compare_versions(1, '<', 2) + print(api.version()) + print(api.vercmp(1, 2)) + print(api.compare_versions(1, '<', 2)) if __name__ == '__main__': diff --git a/urls.py b/urls.py index 134ce33e..d95dc63c 100644 --- a/urls.py +++ b/urls.py @@ -127,7 +127,7 @@ urlpatterns += [url(old_url, RedirectView.as_view(url=new_url)) def show_urls(urllist=urlpatterns, depth=0): for entry in urllist: - print " " * depth, entry.regex.pattern + print(" " * depth, entry.regex.pattern) if hasattr(entry, 'url_patterns'): show_urls(entry.url_patterns, depth + 1) -- cgit v1.2.3-55-g3dc8