Fix bad indentation in glance

Fix for bad indentation warnings from pylint. Closes-Bug: #1356406 Change-Id: I425de4975a4468495a000e408e8d7cf94b646912 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-08-13 16:55:53 +02:00
parent 3bd4840865
commit 9e9d49c4ab
3 changed files with 70 additions and 70 deletions
@@ -351,17 +351,17 @@ class Task(object):
            self._message = six.text_type('')

    def _validate_task_status_transition(self, cur_status, new_status):
-            valid_transitions = {
-                'pending': ['processing', 'failure'],
-                'processing': ['success', 'failure'],
-                'success': [],
-                'failure': [],
-            }
+        valid_transitions = {
+            'pending': ['processing', 'failure'],
+            'processing': ['success', 'failure'],
+            'success': [],
+            'failure': [],
+        }

-            if new_status in valid_transitions[cur_status]:
-                return True
-            else:
-                return False
+        if new_status in valid_transitions[cur_status]:
+            return True
+        else:
+            return False

    def _set_task_status(self, new_status):
        if self._validate_task_status_transition(self.status, new_status):
@@ -19,65 +19,65 @@ from glance.registry.api.v1 import members


 def init(mapper):
-        images_resource = images.create_resource()
+    images_resource = images.create_resource()

-        mapper.connect("/",
-                       controller=images_resource,
-                       action="index")
-        mapper.connect("/images",
-                       controller=images_resource,
-                       action="index",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images",
-                       controller=images_resource,
-                       action="create",
-                       conditions={'method': ['POST']})
-        mapper.connect("/images/detail",
-                       controller=images_resource,
-                       action="detail",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="show",
-                       conditions=dict(method=["GET"]))
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="update",
-                       conditions=dict(method=["PUT"]))
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="delete",
-                       conditions=dict(method=["DELETE"]))
+    mapper.connect("/",
+                   controller=images_resource,
+                   action="index")
+    mapper.connect("/images",
+                   controller=images_resource,
+                   action="index",
+                   conditions={'method': ['GET']})
+    mapper.connect("/images",
+                   controller=images_resource,
+                   action="create",
+                   conditions={'method': ['POST']})
+    mapper.connect("/images/detail",
+                   controller=images_resource,
+                   action="detail",
+                   conditions={'method': ['GET']})
+    mapper.connect("/images/{id}",
+                   controller=images_resource,
+                   action="show",
+                   conditions=dict(method=["GET"]))
+    mapper.connect("/images/{id}",
+                   controller=images_resource,
+                   action="update",
+                   conditions=dict(method=["PUT"]))
+    mapper.connect("/images/{id}",
+                   controller=images_resource,
+                   action="delete",
+                   conditions=dict(method=["DELETE"]))

-        members_resource = members.create_resource()
+    members_resource = members.create_resource()

-        mapper.connect("/images/{image_id}/members",
-                       controller=members_resource,
-                       action="index",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images/{image_id}/members",
-                       controller=members_resource,
-                       action="create",
-                       conditions={'method': ['POST']})
-        mapper.connect("/images/{image_id}/members",
-                       controller=members_resource,
-                       action="update_all",
-                       conditions=dict(method=["PUT"]))
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="show",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="update",
-                       conditions={'method': ['PUT']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="delete",
-                       conditions={'method': ['DELETE']})
-        mapper.connect("/shared-images/{id}",
-                       controller=members_resource,
-                       action="index_shared_images")
+    mapper.connect("/images/{image_id}/members",
+                   controller=members_resource,
+                   action="index",
+                   conditions={'method': ['GET']})
+    mapper.connect("/images/{image_id}/members",
+                   controller=members_resource,
+                   action="create",
+                   conditions={'method': ['POST']})
+    mapper.connect("/images/{image_id}/members",
+                   controller=members_resource,
+                   action="update_all",
+                   conditions=dict(method=["PUT"]))
+    mapper.connect("/images/{image_id}/members/{id}",
+                   controller=members_resource,
+                   action="show",
+                   conditions={'method': ['GET']})
+    mapper.connect("/images/{image_id}/members/{id}",
+                   controller=members_resource,
+                   action="update",
+                   conditions={'method': ['PUT']})
+    mapper.connect("/images/{image_id}/members/{id}",
+                   controller=members_resource,
+                   action="delete",
+                   conditions={'method': ['DELETE']})
+    mapper.connect("/shared-images/{id}",
+                   controller=members_resource,
+                   action="index_shared_images")


 class API(wsgi.Router):
@@ -18,10 +18,10 @@ from glance.registry.api.v2 import rpc


 def init(mapper):
-        rpc_resource = rpc.create_resource()
-        mapper.connect("/rpc", controller=rpc_resource,
-                       conditions=dict(method=["POST"]),
-                       action="__call__")
+    rpc_resource = rpc.create_resource()
+    mapper.connect("/rpc", controller=rpc_resource,
+                   conditions=dict(method=["POST"]),
+                   action="__call__")


 class API(wsgi.Router):