diff --git a/heatclient/common/http.py b/heatclient/common/http.py
index 9fb06cb7..ecadd9f4 100644
--- a/heatclient/common/http.py
+++ b/heatclient/common/http.py
@@ -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)
diff --git a/tox.ini b/tox.ini
index c88d68b1..bea0b49f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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