Fixed a bunch of spacing

Nothing too complicated here.  I fixed a bunch of spacing issues
that I saw in OSC.

Change-Id: I935ab48e7c5bac5f88ecdb3a05f73fb44fc9f41d

7 files changed, 80 insertions, 57 deletions

diff --git a/openstackclient/tests/identity/v2_0/fakes.py b/openstackclient/tests/identity/v2_0/fakes.py
index 565606c1..b37bd9da 100644
--- a/openstackclient/tests/identity/v2_0/fakes.py
+++ b/openstackclient/tests/identity/v2_0/fakes.py
@@ -128,6 +128,7 @@ EXTENSION = {
 
 
 class FakeIdentityv2Client(object):
+
     def __init__(self, **kwargs):
         self.roles = mock.Mock()
         self.roles.resource_class = fakes.FakeResource(None, {})
@@ -157,6 +158,7 @@ class FakeIdentityv2Client(object):
 
 
 class TestIdentityv2(utils.TestCommand):
+
     def setUp(self):
         super(TestIdentityv2, self).setUp()
 
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 420604f1..1422166a 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -420,6 +420,7 @@ OAUTH_VERIFIER = {
 
 
 class FakeAuth(object):
+
     def __init__(self, auth_method_class=None):
         self._auth_method_class = auth_method_class
 
@@ -428,11 +429,13 @@ class FakeAuth(object):
 
 
 class FakeSession(object):
+
     def __init__(self, **kwargs):
         self.auth = FakeAuth()
 
 
 class FakeIdentityv3Client(object):
+
     def __init__(self, **kwargs):
         self.domains = mock.Mock()
         self.domains.resource_class = fakes.FakeResource(None, {})
@@ -468,6 +471,7 @@ class FakeIdentityv3Client(object):
 
 
 class FakeFederationManager(object):
+
     def __init__(self, **kwargs):
         self.identity_providers = mock.Mock()
         self.identity_providers.resource_class = fakes.FakeResource(None, {})
@@ -484,12 +488,14 @@ class FakeFederationManager(object):
 
 
 class FakeFederatedClient(FakeIdentityv3Client):
+
     def __init__(self, **kwargs):
         super(FakeFederatedClient, self).__init__(**kwargs)
         self.federation = FakeFederationManager()
 
 
 class FakeOAuth1Client(FakeIdentityv3Client):
+
     def __init__(self, **kwargs):
         super(FakeOAuth1Client, self).__init__(**kwargs)
 
@@ -502,6 +508,7 @@ class FakeOAuth1Client(FakeIdentityv3Client):
 
 
 class TestIdentityv3(utils.TestCommand):
+
     def setUp(self):
         super(TestIdentityv3, self).setUp()
 
@@ -512,6 +519,7 @@ class TestIdentityv3(utils.TestCommand):
 
 
 class TestFederatedIdentity(utils.TestCommand):
+
     def setUp(self):
         super(TestFederatedIdentity, self).setUp()
 
@@ -522,6 +530,7 @@ class TestFederatedIdentity(utils.TestCommand):
 
 
 class TestOAuth1(utils.TestCommand):
+
     def setUp(self):
         super(TestOAuth1, self).setUp()
 
diff --git a/openstackclient/tests/identity/v3/test_credential.py b/openstackclient/tests/identity/v3/test_credential.py
index e2e690c3..afff7b6c 100644
--- a/openstackclient/tests/identity/v3/test_credential.py
+++ b/openstackclient/tests/identity/v3/test_credential.py
@@ -46,6 +46,7 @@ class TestCredential(identity_fakes.TestIdentityv3):
 
 
 class TestCredentialSet(TestCredential):
+
     def setUp(self):
         super(TestCredentialSet, self).setUp()
         self.cmd = credential.SetCredential(self.app, None)
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index 75911510..ddad6ffb 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -368,6 +368,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
     def test_identity_provider_set_description(self):
         """Set Identity Provider's description. """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
@@ -412,6 +413,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
         Set Identity Provider's ``enabled`` attribute to False.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
@@ -459,6 +461,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
         Set Identity Provider's ``enabled`` attribute to True.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             resources = fakes.FakeResource(
@@ -495,6 +498,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
         Set Identity Provider's ``enabled`` attribute to True.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             self.new_remote_id = 'new_entity'
@@ -540,6 +544,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
 
         Set Identity Provider's ``enabled`` attribute to True.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             self.new_remote_id = 'new_entity'
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index f6e88885..e811c0b6 100644
--- a/openstackclient/tests/identity/v3/test_mappings.py
+++ b/openstackclient/tests/identity/v3/test_mappings.py
@@ -33,71 +33,74 @@ class TestMapping(identity_fakes.TestFederatedIdentity):
 
 
 class TestMappingCreate(TestMapping):
-        def setUp(self):
-                super(TestMappingCreate, self).setUp()
-                self.mapping_mock.create.return_value = fakes.FakeResource(
-                    None,
-                    copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
-                    loaded=True
-                )
-                self.cmd = mapping.CreateMapping(self.app, None)
-
-        def test_create_mapping(self):
-                arglist = [
-                    '--rules', identity_fakes.mapping_rules_file_path,
-                    identity_fakes.mapping_id
-                ]
-                verifylist = [
-                    ('mapping', identity_fakes.mapping_id),
-                    ('rules', identity_fakes.mapping_rules_file_path)
-                ]
-
-                parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-                mocker = mock.Mock()
-                mocker.return_value = identity_fakes.MAPPING_RULES
-                with mock.patch("openstackclient.identity.v3.mapping."
-                                "CreateMapping._read_rules", mocker):
-                        columns, data = self.cmd.take_action(parsed_args)
-
-                self.mapping_mock.create.assert_called_with(
-                    mapping_id=identity_fakes.mapping_id,
-                    rules=identity_fakes.MAPPING_RULES)
-
-                collist = ('id', 'rules')
-                self.assertEqual(collist, columns)
-
-                datalist = (identity_fakes.mapping_id,
-                            identity_fakes.MAPPING_RULES)
-                self.assertEqual(datalist, data)
+
+    def setUp(self):
+        super(TestMappingCreate, self).setUp()
+        self.mapping_mock.create.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+            loaded=True
+        )
+        self.cmd = mapping.CreateMapping(self.app, None)
+
+    def test_create_mapping(self):
+        arglist = [
+            '--rules', identity_fakes.mapping_rules_file_path,
+            identity_fakes.mapping_id
+        ]
+        verifylist = [
+            ('mapping', identity_fakes.mapping_id),
+            ('rules', identity_fakes.mapping_rules_file_path)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        mocker = mock.Mock()
+        mocker.return_value = identity_fakes.MAPPING_RULES
+        with mock.patch("openstackclient.identity.v3.mapping."
+                        "CreateMapping._read_rules", mocker):
+            columns, data = self.cmd.take_action(parsed_args)
+
+        self.mapping_mock.create.assert_called_with(
+            mapping_id=identity_fakes.mapping_id,
+            rules=identity_fakes.MAPPING_RULES)
+
+        collist = ('id', 'rules')
+        self.assertEqual(collist, columns)
+
+        datalist = (identity_fakes.mapping_id,
+                    identity_fakes.MAPPING_RULES)
+        self.assertEqual(datalist, data)
 
 
 class TestMappingDelete(TestMapping):
-        def setUp(self):
-            super(TestMappingDelete, self).setUp()
-            self.mapping_mock.get.return_value = fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
-                loaded=True)
 
-            self.mapping_mock.delete.return_value = None
-            self.cmd = mapping.DeleteMapping(self.app, None)
+    def setUp(self):
+        super(TestMappingDelete, self).setUp()
+        self.mapping_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+            loaded=True)
 
-        def test_delete_mapping(self):
-            arglist = [
-                identity_fakes.mapping_id
-            ]
-            verifylist = [
-                ('mapping', identity_fakes.mapping_id)
-            ]
+        self.mapping_mock.delete.return_value = None
+        self.cmd = mapping.DeleteMapping(self.app, None)
 
-            parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-            self.cmd.take_action(parsed_args)
-            self.mapping_mock.delete.assert_called_with(
-                identity_fakes.mapping_id)
+    def test_delete_mapping(self):
+        arglist = [
+            identity_fakes.mapping_id
+        ]
+        verifylist = [
+            ('mapping', identity_fakes.mapping_id)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+        self.mapping_mock.delete.assert_called_with(
+            identity_fakes.mapping_id)
 
 
 class TestMappingList(TestMapping):
+
     def setUp(self):
         super(TestMappingList, self).setUp()
         self.mapping_mock.get.return_value = fakes.FakeResource(
@@ -141,6 +144,7 @@ class TestMappingList(TestMapping):
 
 
 class TestMappingShow(TestMapping):
+
     def setUp(self):
         super(TestMappingShow, self).setUp()
 
diff --git a/openstackclient/tests/identity/v3/test_role_assignment.py b/openstackclient/tests/identity/v3/test_role_assignment.py
index 5def7632..8956b74f 100644
--- a/openstackclient/tests/identity/v3/test_role_assignment.py
+++ b/openstackclient/tests/identity/v3/test_role_assignment.py
@@ -557,7 +557,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             '@'.join([identity_fakes.user_name, identity_fakes.domain_name]),
             '',
             '@'.join([identity_fakes.project_name,
-                     identity_fakes.domain_name]),
+                      identity_fakes.domain_name]),
             '',
             False
         ), (identity_fakes.role_name,
diff --git a/openstackclient/tests/identity/v3/test_service_provider.py b/openstackclient/tests/identity/v3/test_service_provider.py
index fb7576f1..39f779d0 100644
--- a/openstackclient/tests/identity/v3/test_service_provider.py
+++ b/openstackclient/tests/identity/v3/test_service_provider.py
@@ -305,6 +305,7 @@ class TestServiceProviderSet(TestServiceProvider):
 
         Set Service Provider's ``enabled`` attribute to False.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             updated_sp = copy.deepcopy(service_fakes.SERVICE_PROVIDER)
@@ -343,6 +344,7 @@ class TestServiceProviderSet(TestServiceProvider):
 
         Set Service Provider's ``enabled`` attribute to True.
         """
+
         def prepare(self):
             """Prepare fake return objects before the test is executed"""
             resources = fakes.FakeResource(