Merge "Fix and enable Hacking H501 warning"

This commit is contained in:
Jenkins 2013-09-04 03:12:33 +00:00 committed by Gerrit Code Review
commit a7ffcd76d0
2 changed files with 5 additions and 3 deletions

View File

@ -148,11 +148,13 @@ class HTTPClient(object):
conn.request(method, conn_url, **kwargs)
resp = conn.getresponse()
except socket.gaierror as e:
message = "Error finding address for %(url)s: %(e)s" % locals()
message = ("Error finding address for %(url)s: %(e)s" %
{'url': url, 'e': e})
raise exc.InvalidEndpoint(message=message)
except (socket.error, socket.timeout) as e:
endpoint = self.endpoint
message = "Error communicating with %(endpoint)s %(e)s" % locals()
message = ("Error communicating with %(endpoint)s %(e)s" %
{'endpoint': endpoint, 'e': e})
raise exc.CommunicationError(message=message)
body_iter = ResponseBodyIterator(resp)

View File

@ -22,6 +22,6 @@ downloadcache = ~/cache/pip
[flake8]
show-source = True
ignore = H233,H302,H501
ignore = H233,H302
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build