diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-18 21:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-18 21:46:45 +0000 |
| commit | 06b9eb027c4cd0e22f2d6bb5295b9ebbef8f708d (patch) | |
| tree | ab7b1ad26427cb928210935e4aa02aecc082db83 | |
| parent | d8c47762afe97859a6ae06bd5d65553c22233a1c (diff) | |
| parent | b5f1db6cd6ef1d5128e16864ce8381459dc1021d (diff) | |
| download | gear-06b9eb027c4cd0e22f2d6bb5295b9ebbef8f708d.tar.gz | |
Merge "Use except x as y instead of except x, y"
| -rw-r--r-- | gear/__init__.py | 8 | ||||
| -rw-r--r-- | gear/acl.py | 4 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/gear/__init__.py b/gear/__init__.py index 76109fa..fd8ad09 100644 --- a/gear/__init__.py +++ b/gear/__init__.py @@ -759,7 +759,7 @@ class BaseClientServer(object): self.connections_condition.release() try: self._pollLoop() - except socket.error, e: + except socket.error as e: if e.errno == errno.ECONNRESET: self.log.debug("Connection reset by peer") # This will get logged later at info level as @@ -2502,7 +2502,7 @@ class Server(BaseClientServer): else: request.connection.sendRaw(b'ERR UNKNOWN_ACL_VERB\n') return - except ACLError, e: + except ACLError as e: self.log.info("Error in grant command: %s" % (e.message,)) request.connection.sendRaw(b'ERR UNABLE %s\n' % (e.message,)) return @@ -2536,7 +2536,7 @@ class Server(BaseClientServer): else: request.connection.sendRaw(b'ERR UNKNOWN_ACL_VERB\n') return - except ACLError, e: + except ACLError as e: self.log.info("Error in revoke command: %s" % (e.message,)) request.connection.sendRaw(b'ERR UNABLE %s\n' % (e.message,)) return @@ -2566,7 +2566,7 @@ class Server(BaseClientServer): else: request.connection.sendRaw(b'ERR UNKNOWN_ACL_VERB\n') return - except ACLError, e: + except ACLError as e: self.log.info("Error in self-revoke command: %s" % (e.message,)) request.connection.sendRaw(b'ERR UNABLE %s\n' % (e.message,)) return diff --git a/gear/acl.py b/gear/acl.py index ea79a67..497daba 100644 --- a/gear/acl.py +++ b/gear/acl.py @@ -95,7 +95,7 @@ class ACLEntry(object): if register: try: self._register = re.compile(register) - except re.error, e: + except re.error as e: raise ACLError('Regular expression error: %s' % (e.message,)) else: self._register = None @@ -110,7 +110,7 @@ class ACLEntry(object): if invoke: try: self._invoke = re.compile(invoke) - except re.error, e: + except re.error as e: raise ACLError('Regular expression error: %s' % (e.message,)) else: self._invoke = None @@ -32,6 +32,7 @@ exclude = .venv,.tox,dist,doc,*.egg show-source = true # E123, E125, and H ignored intentionally in this code-base ignore = E123,E125,H +select = H231 [testenv:doc] commands = python setup.py build_sphinx |