Merge "Fixed indentation in common/ and obj/"

swift/common/middleware/copy.py

@@ -426,8 +426,8 @@ class ServerSideCopyMiddleware(object):
         resp_headers['X-Copied-From-Account'] = quote(acct)
         resp_headers['X-Copied-From'] = quote(path)
         if 'last-modified' in source_resp.headers:
-                resp_headers['X-Copied-From-Last-Modified'] = \
-                    source_resp.headers['last-modified']
+            resp_headers['X-Copied-From-Last-Modified'] = \
+                source_resp.headers['last-modified']
         # Existing sys and user meta of source object is added to response
         # headers in addition to the new ones.
         _copy_headers(sink_req.headers, resp_headers)

swift/common/middleware/keystoneauth.py

@@ -307,7 +307,7 @@ class KeystoneAuth(object):
         method = req.method
         if (obj or (container and method != 'PUT')
                 or method not in ['PUT', 'POST']):
-                return
+            return
 
         tenant_id, tenant_name = env_identity['tenant']
         exists, sysmeta_id = self._get_project_domain_id(req.environ)

swift/obj/diskfile.py

@@ -2811,13 +2811,13 @@ class ECDiskFile(BaseDiskFile):
                              for fi in pref['exclude']]}
                 for pref in frag_prefs]
         except ValueError as e:
-                raise DiskFileError(
-                    'Bad timestamp in frag_prefs: %r: %s'
-                    % (frag_prefs, e))
+            raise DiskFileError(
+                'Bad timestamp in frag_prefs: %r: %s'
+                % (frag_prefs, e))
         except DiskFileError as e:
-                raise DiskFileError(
-                    'Bad fragment index in frag_prefs: %r: %s'
-                    % (frag_prefs, e))
+            raise DiskFileError(
+                'Bad fragment index in frag_prefs: %r: %s'
+                % (frag_prefs, e))
         except (KeyError, TypeError) as e:
             raise DiskFileError(
                 'Bad frag_prefs: %r: %s' % (frag_prefs, e))