Clean up pep8 E121 violations

Fixed E121 errors.
All other ignores are to be removed in the next sequence of patches.

Change-Id: I5d3f490a1bfbe1945a23a7fc1f38d818c0650ff7

glance/api/v2/images.py

@@ -578,9 +578,9 @@ class ResponseSerializer(wsgi.JSONResponseSerializer):
         params.pop('marker', None)
         query = urllib.urlencode(params)
         body = {
-               'images': [self._format_image(i) for i in result['images']],
-               'first': '/v2/images',
-               'schema': '/v2/schemas/images',
+            'images': [self._format_image(i) for i in result['images']],
+            'first': '/v2/images',
+            'schema': '/v2/schemas/images',
         }
         if query:
             body['first'] = '%s?%s' % (body['first'], query)
@@ -608,10 +608,10 @@ _BASE_PROPERTIES = {
         'maxLength': 255,
     },
     'status': {
-      'type': 'string',
-      'description': 'Status of the image',
-      'enum': ['queued', 'saving', 'active', 'killed',
-               'deleted', 'pending_delete'],
+        'type': 'string',
+        'description': 'Status of the image',
+        'enum': ['queued', 'saving', 'active', 'killed',
+                 'deleted', 'pending_delete'],
     },
     'visibility': {
         'type': 'string',

glance/db/simple/api.py

@@ -342,9 +342,8 @@ def image_update(context, image_id, image_values, purge_props=False):
             prop['deleted'] = True
 
     # add in any completly new properties
-    image['properties'].extend([
-            {'name': k, 'value': v, 'deleted': False}
-             for k, v in new_properties.items()])
+    image['properties'].extend([{'name': k, 'value': v, 'deleted': False}
+                                for k, v in new_properties.items()])
 
     image['updated_at'] = timeutils.utcnow()
     image.update(image_values)

glance/registry/client.py

@@ -133,8 +133,8 @@ class RegistryClient(BaseClient):
         if 'image' not in image_metadata.keys():
             image_metadata = dict(image=image_metadata)
 
-        image_metadata['image'] = self.encrypt_metadata(
-                                      image_metadata['image'])
+        encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
+        image_metadata['image'] = encrypted_metadata
         body = json.dumps(image_metadata)
 
         res = self.do_request("POST", "/images", body=body, headers=headers)
@@ -150,8 +150,8 @@ class RegistryClient(BaseClient):
         if 'image' not in image_metadata.keys():
             image_metadata = dict(image=image_metadata)
 
-        image_metadata['image'] = self.encrypt_metadata(
-                                      image_metadata['image'])
+        encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
+        image_metadata['image'] = encrypted_metadata
         body = json.dumps(image_metadata)
 
         headers = {

glance/tests/functional/v1/test_api.py

@@ -1300,8 +1300,8 @@ class TestApi(functional.FunctionalTest):
         # POST queued image
         path = "http://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
         headers = {
-           'X-Image-Meta-Name': 'Image1',
-           'X-Image-Meta-Is-Public': 'True',
+            'X-Image-Meta-Name': 'Image1',
+            'X-Image-Meta-Is-Public': 'True',
         }
         http = httplib2.Http()
         response, content = http.request(path, 'POST', headers=headers)

glance/tests/unit/api/test_common.py

@@ -95,8 +95,9 @@ class TestSizeCheckedIter(unittest.TestCase):
     def test_too_few_chunks(self):
         resp = self._get_webob_response()
         meta = self._get_image_metadata()
-        checked_image = glance.api.common.size_checked_iter(
-                 resp, meta, 6, ['AB', 'CD'], None)
+        checked_image = glance.api.common.size_checked_iter(resp, meta, 6,
+                                                            ['AB', 'CD'],
+                                                            None)
 
         self.assertEqual('AB', checked_image.next())
         self.assertEqual('CD', checked_image.next())
@@ -105,8 +106,9 @@ class TestSizeCheckedIter(unittest.TestCase):
     def test_too_much_data(self):
         resp = self._get_webob_response()
         meta = self._get_image_metadata()
-        checked_image = glance.api.common.size_checked_iter(
-                 resp, meta, 3, ['AB', 'CD'], None)
+        checked_image = glance.api.common.size_checked_iter(resp, meta, 3,
+                                                            ['AB', 'CD'],
+                                                            None)
 
         self.assertEqual('AB', checked_image.next())
         self.assertEqual('CD', checked_image.next())
@@ -115,8 +117,9 @@ class TestSizeCheckedIter(unittest.TestCase):
     def test_too_little_data(self):
         resp = self._get_webob_response()
         meta = self._get_image_metadata()
-        checked_image = glance.api.common.size_checked_iter(
-                 resp, meta, 6, ['AB', 'CD', 'E'], None)
+        checked_image = glance.api.common.size_checked_iter(resp, meta, 6,
+                                                            ['AB', 'CD', 'E'],
+                                                            None)
 
         self.assertEqual('AB', checked_image.next())
         self.assertEqual('CD', checked_image.next())

glance/tests/unit/v1/test_api.py

@@ -3140,24 +3140,25 @@ class TestImageSerializer(base.IsolatedUnitTest):
                 yield x
 
         self.FIXTURE = {
-             'image_iterator': image_iter(),
-             'image_meta': {
-                 'id': UUID2,
-                 'name': 'fake image #2',
-                 'status': 'active',
-                 'disk_format': 'vhd',
-                 'container_format': 'ovf',
-                 'is_public': True,
-                 'created_at': timeutils.utcnow(),
-                 'updated_at': timeutils.utcnow(),
-                 'deleted_at': None,
-                 'deleted': False,
-                 'checksum': '06ff575a2856444fbe93100157ed74ab92eb7eff',
-                 'size': 19,
-                 'owner': _gen_uuid(),
-                 'location': "file:///tmp/glance-tests/2",
-                 'properties': {}}
-             }
+            'image_iterator': image_iter(),
+            'image_meta': {
+                'id': UUID2,
+                'name': 'fake image #2',
+                'status': 'active',
+                'disk_format': 'vhd',
+                'container_format': 'ovf',
+                'is_public': True,
+                'created_at': timeutils.utcnow(),
+                'updated_at': timeutils.utcnow(),
+                'deleted_at': None,
+                'deleted': False,
+                'checksum': '06ff575a2856444fbe93100157ed74ab92eb7eff',
+                'size': 19,
+                'owner': _gen_uuid(),
+                'location': "file:///tmp/glance-tests/2",
+                'properties': {},
+            }
+        }
 
     def test_meta(self):
         exp_headers = {'x-image-meta-id': UUID2,
@@ -3178,27 +3179,27 @@ class TestImageSerializer(base.IsolatedUnitTest):
         # metadata will actually be unicode when handled internally. But we
         # want to output utf-8.
         FIXTURE = {
-             'image_meta': {
-                 'id': unicode(UUID2),
-                 'name': u'fake image #2 with utf-8 éàè',
-                 'status': u'active',
-                 'disk_format': u'vhd',
-                 'container_format': u'ovf',
-                 'is_public': True,
-                 'created_at': timeutils.utcnow(),
-                 'updated_at': timeutils.utcnow(),
-                 'deleted_at': None,
-                 'deleted': False,
-                 'checksum': u'06ff575a2856444fbe93100157ed74ab92eb7eff',
-                 'size': 19,
-                 'owner': unicode(_gen_uuid()),
-                 'location': u"file:///tmp/glance-tests/2",
-                 'properties': {
-                     u'prop_éé': u'ça marche',
-                     u'prop_çé': u'çé',
-                     }
-                 }
-             }
+            'image_meta': {
+                'id': unicode(UUID2),
+                'name': u'fake image #2 with utf-8 éàè',
+                'status': u'active',
+                'disk_format': u'vhd',
+                'container_format': u'ovf',
+                'is_public': True,
+                'created_at': timeutils.utcnow(),
+                'updated_at': timeutils.utcnow(),
+                'deleted_at': None,
+                'deleted': False,
+                'checksum': u'06ff575a2856444fbe93100157ed74ab92eb7eff',
+                'size': 19,
+                'owner': unicode(_gen_uuid()),
+                'location': u"file:///tmp/glance-tests/2",
+                'properties': {
+                    u'prop_éé': u'ça marche',
+                    u'prop_çé': u'çé',
+                }
+            }
+        }
         exp_headers = {'x-image-meta-id': UUID2.encode('utf-8'),
                        'x-image-meta-location': 'file:///tmp/glance-tests/2',
                        'ETag': '06ff575a2856444fbe93100157ed74ab92eb7eff',

tox.ini

@@ -18,7 +18,7 @@ downloadcache = ~/cache/pip
 
 [testenv:pep8]
 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 .
+commands = pep8 --ignore=E122,E123,E124,E125,E126,E127,E128,E711 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack .
 
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1