Merge "Clean up pep8 E502, E711 violations"

.mailmap

@@ -17,3 +17,4 @@
 <jeblair@hp.com> <james.blair@rackspace.com>
 <chris@pistoncloud.com> <chris@slicehost.com>
 <ken.pepple@gmail.com> <ken.pepple@rabbityard.com>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>

glance/common/utils.py

@@ -386,7 +386,7 @@ def _get_terminal_size_unknownOS():
 
     height_width = func.get(platform.os.name, _get_terminal_size_unknownOS)()
 
-    if height_width == None:
+    if height_width is None:
         raise exception.Invalid()
 
     for i in height_width:

glance/registry/client.py

@@ -89,8 +89,8 @@ def do_request(self, method, action, **kwargs):
                   action, **kwargs)
             status = res.status
             request_id = res.getheader('x-openstack-request-id')
-            msg = _("Registry request %(method)s %(action)s HTTP %(status)s"\
-                  " request id %(request_id)s")
+            msg = _("Registry request %(method)s %(action)s HTTP %(status)s"
+                    " request id %(request_id)s")
             LOG.debug(msg % locals())
 
         except:

tools/test-requires

@@ -11,7 +11,7 @@ nose
 nose-exclude
 openstack.nose_plugin>=0.7
 nosehtmloutput>=0.0.3
-pep8==1.1
+pep8==1.3.3
 sphinx>=1.1.2
 requests
 

tox.ini

@@ -17,7 +17,8 @@ commands = nosetests {posargs}
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack .
+deps = pep8==1.3.3
+commands = pep8 --ignore=E121,E122,E123,E124,E125,E126,E127,E128,E711 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack .
 
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1