From ddefc4d3faf793e4c3a945a819468ef45bb653b7 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 29 May 2014 23:48:56 +0200 Subject: [PATCH] Use except x as y instead of except x, y According to https://docs.python.org/3/howto/pyporting.html the syntax changed in Python 3.x. The new syntax is usable with Python >= 2.6 and should be preferred to be compatible with Python3. Enabled hacking check H231. Change-Id: I4c20a04bc7732efc2d4bbcbc3d285107b244e5fa --- launch/utils.py | 2 +- modules/log_processor/files/log-gearman-worker.py | 2 +- tox.ini | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/launch/utils.py b/launch/utils.py index 3ab9088f49..2811a17ebc 100644 --- a/launch/utils.py +++ b/launch/utils.py @@ -188,7 +188,7 @@ def ssh_connect(ip, username, connect_kwargs={}, timeout=60): try: client = SSHClient(ip, username, **connect_kwargs) break - except socket.error, e: + except socket.error as e: print "While testing ssh access:", e time.sleep(5) diff --git a/modules/log_processor/files/log-gearman-worker.py b/modules/log_processor/files/log-gearman-worker.py index 23ca4dc21b..0a418d701c 100644 --- a/modules/log_processor/files/log-gearman-worker.py +++ b/modules/log_processor/files/log-gearman-worker.py @@ -180,7 +180,7 @@ class LogRetriever(threading.Thread): raw_buf = b'' try: gzipped, raw_buf = self._get_log_data(source_url, retry) - except urllib2.HTTPError, e: + except urllib2.HTTPError as e: if e.code == 404: logging.info("Unable to retrieve %s: HTTP error 404" % source_url) diff --git a/tox.ini b/tox.ini index da3a6128f6..787d7606b4 100644 --- a/tox.ini +++ b/tox.ini @@ -31,6 +31,7 @@ commands = python modules/accessbot/files/checkaccess.py -l modules/openstack_pr show-source = True exclude = .tox ignore = E125,H +select = H231 [testenv:jjb] basepython = python2.7