Blacken openstackclient.identity

Black used with the '-l 79 -S' flags.

A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.

Change-Id: I2eeade1ce6653be8e9179ecc40105182c5ff5f16
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

9 files changed, 310 insertions, 307 deletions

diff --git a/openstackclient/tests/unit/identity/v2_0/fakes.py b/openstackclient/tests/unit/identity/v2_0/fakes.py
index bd76a784..708f9a83 100644
--- a/openstackclient/tests/unit/identity/v2_0/fakes.py
+++ b/openstackclient/tests/unit/identity/v2_0/fakes.py
@@ -155,7 +155,6 @@ def fake_auth_ref(fake_token, fake_service=None):
 
 
 class FakeIdentityv2Client(object):
-
     def __init__(self, **kwargs):
         self.roles = mock.Mock()
         self.roles.resource_class = fakes.FakeResource(None, {})
@@ -185,7 +184,6 @@ class FakeIdentityv2Client(object):
 
 
 class TestIdentityv2(utils.TestCommand):
-
     def setUp(self):
         super(TestIdentityv2, self).setUp()
 
@@ -212,22 +210,25 @@ class FakeExtension(object):
         # Set default attributes.
         extension_info = {
             'name': 'name-' + uuid.uuid4().hex,
-            'namespace': ('http://docs.openstack.org/identity/'
-                          'api/ext/OS-KSCRUD/v1.0'),
+            'namespace': (
+                'http://docs.openstack.org/identity/' 'api/ext/OS-KSCRUD/v1.0'
+            ),
             'description': 'description-' + uuid.uuid4().hex,
             'updated': '2013-07-07T12:00:0-00:00',
             'alias': 'OS-KSCRUD',
-            'links': ('[{"href":'
-                      '"https://github.com/openstack/identity-api", "type":'
-                      ' "text/html", "rel": "describedby"}]')
+            'links': (
+                '[{"href":'
+                '"https://github.com/openstack/identity-api", "type":'
+                ' "text/html", "rel": "describedby"}]'
+            ),
         }
 
         # Overwrite default attributes.
         extension_info.update(attrs)
 
         extension = fakes.FakeResource(
-            info=copy.deepcopy(extension_info),
-            loaded=True)
+            info=copy.deepcopy(extension_info), loaded=True
+        )
         return extension
 
 
@@ -275,8 +276,8 @@ class FakeCatalog(object):
         catalog_info.update(attrs)
 
         catalog = fakes.FakeResource(
-            info=copy.deepcopy(catalog_info),
-            loaded=True)
+            info=copy.deepcopy(catalog_info), loaded=True
+        )
 
         return catalog
 
@@ -305,8 +306,9 @@ class FakeProject(object):
         }
         project_info.update(attrs)
 
-        project = fakes.FakeResource(info=copy.deepcopy(project_info),
-                                     loaded=True)
+        project = fakes.FakeResource(
+            info=copy.deepcopy(project_info), loaded=True
+        )
         return project
 
     @staticmethod
@@ -352,12 +354,12 @@ class FakeEndpoint(object):
             'id': 'endpoint-id-' + uuid.uuid4().hex,
             'publicurl': 'http://endpoint_publicurl',
             'service_id': 'service-name-' + uuid.uuid4().hex,
-
         }
         endpoint_info.update(attrs)
 
-        endpoint = fakes.FakeResource(info=copy.deepcopy(endpoint_info),
-                                      loaded=True)
+        endpoint = fakes.FakeResource(
+            info=copy.deepcopy(endpoint_info), loaded=True
+        )
         return endpoint
 
     @staticmethod
@@ -399,12 +401,12 @@ class FakeService(object):
             'name': 'service-name-' + uuid.uuid4().hex,
             'description': 'service_description',
             'type': 'service_type',
-
         }
         service_info.update(attrs)
 
-        service = fakes.FakeResource(info=copy.deepcopy(service_info),
-                                     loaded=True)
+        service = fakes.FakeResource(
+            info=copy.deepcopy(service_info), loaded=True
+        )
         return service
 
     @staticmethod
@@ -447,8 +449,7 @@ class FakeRole(object):
         }
         role_info.update(attrs)
 
-        role = fakes.FakeResource(info=copy.deepcopy(role_info),
-                                  loaded=True)
+        role = fakes.FakeResource(info=copy.deepcopy(role_info), loaded=True)
         return role
 
     @staticmethod
@@ -493,8 +494,7 @@ class FakeUser(object):
         }
         user_info.update(attrs)
 
-        user = fakes.FakeResource(info=copy.deepcopy(user_info),
-                                  loaded=True)
+        user = fakes.FakeResource(info=copy.deepcopy(user_info), loaded=True)
         return user
 
     @staticmethod
diff --git a/openstackclient/tests/unit/identity/v2_0/test_catalog.py b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
index bfb28f69..c420d33c 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_catalog.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
@@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils
 
 
 class TestCatalog(utils.TestCommand):
-
     service_catalog = identity_fakes.FakeCatalog.create_catalog()
 
     def setUp(self):
@@ -37,7 +36,6 @@ class TestCatalog(utils.TestCommand):
 
 
 class TestCatalogList(TestCatalog):
-
     columns = (
         'Name',
         'Type',
@@ -68,12 +66,15 @@ class TestCatalogList(TestCatalog):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            'supernova',
-            'compute',
-            catalog.EndpointsColumn(
-                auth_ref.service_catalog.catalog[0]['endpoints']),
-        ), )
+        datalist = (
+            (
+                'supernova',
+                'compute',
+                catalog.EndpointsColumn(
+                    auth_ref.service_catalog.catalog[0]['endpoints']
+                ),
+            ),
+        )
         self.assertCountEqual(datalist, tuple(data))
 
     def test_catalog_list_with_endpoint_url(self):
@@ -111,17 +112,19 @@ class TestCatalogList(TestCatalog):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            'supernova',
-            'compute',
-            catalog.EndpointsColumn(
-                auth_ref.service_catalog.catalog[0]['endpoints']),
-        ), )
+        datalist = (
+            (
+                'supernova',
+                'compute',
+                catalog.EndpointsColumn(
+                    auth_ref.service_catalog.catalog[0]['endpoints']
+                ),
+            ),
+        )
         self.assertCountEqual(datalist, tuple(data))
 
 
 class TestCatalogShow(TestCatalog):
-
     def setUp(self):
         super(TestCatalogShow, self).setUp()
 
@@ -153,7 +156,8 @@ class TestCatalogShow(TestCatalog):
         self.assertEqual(collist, columns)
         datalist = (
             catalog.EndpointsColumn(
-                auth_ref.service_catalog.catalog[0]['endpoints']),
+                auth_ref.service_catalog.catalog[0]['endpoints']
+            ),
             self.service_catalog.id,
             'supernova',
             'compute',
@@ -174,7 +178,8 @@ class TestFormatColumns(TestCatalog):
             '<none>\n  publicURL: https://public.none.example.com\n  '
             'internalURL: https://internal.none.example.com\n  '
             'adminURL: https://admin.none.example.com\n',
-            col.human_readable())
+            col.human_readable(),
+        )
 
     def test_endpoints_column_human_readable_with_partial_endpoint_urls(self):
         endpoints = [
@@ -193,4 +198,5 @@ class TestFormatColumns(TestCatalog):
             'one\n  publicURL: https://public.one.example.com\n'
             'two\n  publicURL: https://public.two.example.com\n  '
             'internalURL: https://internal.two.example.com\n',
-            col.human_readable())
+            col.human_readable(),
+        )
diff --git a/openstackclient/tests/unit/identity/v2_0/test_endpoint.py b/openstackclient/tests/unit/identity/v2_0/test_endpoint.py
index 915e04a5..5de396c4 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_endpoint.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_endpoint.py
@@ -16,7 +16,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestEndpoint(identity_fakes.TestIdentityv2):
-
     fake_service = identity_fakes.FakeService.create_one_service()
     attr = {
         'service_name': fake_service.name,
@@ -37,7 +36,6 @@ class TestEndpoint(identity_fakes.TestIdentityv2):
 
 
 class TestEndpointCreate(TestEndpoint):
-
     def setUp(self):
         super(TestEndpointCreate, self).setUp()
 
@@ -50,10 +48,14 @@ class TestEndpointCreate(TestEndpoint):
 
     def test_endpoint_create(self):
         arglist = [
-            '--publicurl', self.fake_endpoint.publicurl,
-            '--internalurl', self.fake_endpoint.internalurl,
-            '--adminurl', self.fake_endpoint.adminurl,
-            '--region', self.fake_endpoint.region,
+            '--publicurl',
+            self.fake_endpoint.publicurl,
+            '--internalurl',
+            self.fake_endpoint.internalurl,
+            '--adminurl',
+            self.fake_endpoint.adminurl,
+            '--region',
+            self.fake_endpoint.region,
             self.fake_service.id,
         ]
         verifylist = [
@@ -80,8 +82,16 @@ class TestEndpointCreate(TestEndpoint):
             self.fake_endpoint.internalurl,
         )
 
-        collist = ('adminurl', 'id', 'internalurl', 'publicurl',
-                   'region', 'service_id', 'service_name', 'service_type')
+        collist = (
+            'adminurl',
+            'id',
+            'internalurl',
+            'publicurl',
+            'region',
+            'service_id',
+            'service_name',
+            'service_type',
+        )
         self.assertEqual(collist, columns)
         datalist = (
             self.fake_endpoint.adminurl,
@@ -98,7 +108,6 @@ class TestEndpointCreate(TestEndpoint):
 
 
 class TestEndpointDelete(TestEndpoint):
-
     def setUp(self):
         super(TestEndpointDelete, self).setUp()
 
@@ -126,7 +135,6 @@ class TestEndpointDelete(TestEndpoint):
 
 
 class TestEndpointList(TestEndpoint):
-
     def setUp(self):
         super(TestEndpointList, self).setUp()
 
@@ -151,12 +159,14 @@ class TestEndpointList(TestEndpoint):
 
         collist = ('ID', 'Region', 'Service Name', 'Service Type')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_endpoint.id,
-            self.fake_endpoint.region,
-            self.fake_endpoint.service_name,
-            self.fake_endpoint.service_type,
-        ), )
+        datalist = (
+            (
+                self.fake_endpoint.id,
+                self.fake_endpoint.region,
+                self.fake_endpoint.service_name,
+                self.fake_endpoint.service_type,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_endpoint_list_long(self):
@@ -175,23 +185,31 @@ class TestEndpointList(TestEndpoint):
 
         self.endpoints_mock.list.assert_called_with()
 
-        collist = ('ID', 'Region', 'Service Name', 'Service Type',
-                   'PublicURL', 'AdminURL', 'InternalURL')
+        collist = (
+            'ID',
+            'Region',
+            'Service Name',
+            'Service Type',
+            'PublicURL',
+            'AdminURL',
+            'InternalURL',
+        )
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_endpoint.id,
-            self.fake_endpoint.region,
-            self.fake_endpoint.service_name,
-            self.fake_endpoint.service_type,
-            self.fake_endpoint.publicurl,
-            self.fake_endpoint.adminurl,
-            self.fake_endpoint.internalurl,
-        ), )
+        datalist = (
+            (
+                self.fake_endpoint.id,
+                self.fake_endpoint.region,
+                self.fake_endpoint.service_name,
+                self.fake_endpoint.service_type,
+                self.fake_endpoint.publicurl,
+                self.fake_endpoint.adminurl,
+                self.fake_endpoint.internalurl,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
 
 class TestEndpointShow(TestEndpoint):
-
     def setUp(self):
         super(TestEndpointShow, self).setUp()
 
@@ -223,8 +241,16 @@ class TestEndpointShow(TestEndpoint):
             self.fake_endpoint.service_id,
         )
 
-        collist = ('adminurl', 'id', 'internalurl', 'publicurl',
-                   'region', 'service_id', 'service_name', 'service_type')
+        collist = (
+            'adminurl',
+            'id',
+            'internalurl',
+            'publicurl',
+            'region',
+            'service_id',
+            'service_name',
+            'service_type',
+        )
         self.assertEqual(collist, columns)
         datalist = (
             self.fake_endpoint.adminurl,
diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py
index 496214aa..68ec9f02 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_project.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_project.py
@@ -25,7 +25,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestProject(identity_fakes.TestIdentityv2):
-
     fake_project = identity_fakes.FakeProject.create_one_project()
     fake_projects = identity_fakes.FakeProject.create_projects()
 
@@ -42,10 +41,18 @@ class TestProject(identity_fakes.TestIdentityv2):
         fake_project.name,
     )
     datalists = (
-        (fake_projects[0].description, True,
-         fake_projects[0].id, fake_projects[0].name,),
-        (fake_projects[1].description, True,
-         fake_projects[1].id, fake_projects[1].name,),
+        (
+            fake_projects[0].description,
+            True,
+            fake_projects[0].id,
+            fake_projects[0].name,
+        ),
+        (
+            fake_projects[1].description,
+            True,
+            fake_projects[1].id,
+            fake_projects[1].name,
+        ),
     )
 
     def setUp(self):
@@ -57,7 +64,6 @@ class TestProject(identity_fakes.TestIdentityv2):
 
 
 class TestProjectCreate(TestProject):
-
     def setUp(self):
         super(TestProjectCreate, self).setUp()
 
@@ -88,15 +94,15 @@ class TestProjectCreate(TestProject):
             'enabled': True,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, data)
 
     def test_project_create_description(self):
         arglist = [
-            '--description', 'new desc',
+            '--description',
+            'new desc',
             self.fake_project.name,
         ]
         verifylist = [
@@ -116,8 +122,7 @@ class TestProjectCreate(TestProject):
             'enabled': True,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -146,8 +151,7 @@ class TestProjectCreate(TestProject):
             'enabled': True,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -176,8 +180,7 @@ class TestProjectCreate(TestProject):
             'enabled': False,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -185,8 +188,10 @@ class TestProjectCreate(TestProject):
 
     def test_project_create_property(self):
         arglist = [
-            '--property', 'fee=fi',
-            '--property', 'fo=fum',
+            '--property',
+            'fee=fi',
+            '--property',
+            'fo=fum',
             self.fake_project.name,
         ]
         verifylist = [
@@ -208,8 +213,7 @@ class TestProjectCreate(TestProject):
             'fo': 'fum',
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -248,8 +252,7 @@ class TestProjectCreate(TestProject):
             'enabled': True,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -277,8 +280,7 @@ class TestProjectCreate(TestProject):
             'enabled': True,
         }
         self.projects_mock.create.assert_called_with(
-            self.fake_project.name,
-            **kwargs
+            self.fake_project.name, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -286,7 +288,6 @@ class TestProjectCreate(TestProject):
 
 
 class TestProjectDelete(TestProject):
-
     def setUp(self):
         super(TestProjectDelete, self).setUp()
 
@@ -315,8 +316,7 @@ class TestProjectDelete(TestProject):
 
     @mock.patch.object(utils, 'find_resource')
     def test_delete_multi_projects_with_exception(self, find_mock):
-        find_mock.side_effect = [self.fake_project,
-                                 exceptions.CommandError]
+        find_mock.side_effect = [self.fake_project, exceptions.CommandError]
         arglist = [
             self.fake_project.id,
             'unexist_project',
@@ -330,8 +330,7 @@ class TestProjectDelete(TestProject):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 projects failed to delete.',
-                             str(e))
+            self.assertEqual('1 of 2 projects failed to delete.', str(e))
 
         find_mock.assert_any_call(self.projects_mock, self.fake_project.id)
         find_mock.assert_any_call(self.projects_mock, 'unexist_project')
@@ -341,7 +340,6 @@ class TestProjectDelete(TestProject):
 
 
 class TestProjectList(TestProject):
-
     def setUp(self):
         super(TestProjectList, self).setUp()
 
@@ -363,10 +361,12 @@ class TestProjectList(TestProject):
 
         collist = ('ID', 'Name')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_project.id,
-            self.fake_project.name,
-        ), )
+        datalist = (
+            (
+                self.fake_project.id,
+                self.fake_project.name,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_project_list_long(self):
@@ -386,18 +386,23 @@ class TestProjectList(TestProject):
 
         collist = ('ID', 'Name', 'Description', 'Enabled')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_project.id,
-            self.fake_project.name,
-            self.fake_project.description,
-            True,
-        ), )
+        datalist = (
+            (
+                self.fake_project.id,
+                self.fake_project.name,
+                self.fake_project.description,
+                True,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_project_list_sort(self):
         self.projects_mock.list.return_value = self.fake_projects
 
-        arglist = ['--sort', 'name:asc', ]
+        arglist = [
+            '--sort',
+            'name:asc',
+        ]
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -425,7 +430,6 @@ class TestProjectList(TestProject):
 
 
 class TestProjectSet(TestProject):
-
     def setUp(self):
         super(TestProjectSet, self).setUp()
 
@@ -468,11 +472,13 @@ class TestProjectSet(TestProject):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args)
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
     def test_project_set_name(self):
         arglist = [
-            '--name', self.fake_project.name,
+            '--name',
+            self.fake_project.name,
             self.fake_project.name,
         ]
         verifylist = [
@@ -492,14 +498,14 @@ class TestProjectSet(TestProject):
             'tenant_name': self.fake_project.name,
         }
         self.projects_mock.update.assert_called_with(
-            self.fake_project.id,
-            **kwargs
+            self.fake_project.id, **kwargs
         )
         self.assertIsNone(result)
 
     def test_project_set_description(self):
         arglist = [
-            '--description', self.fake_project.description,
+            '--description',
+            self.fake_project.description,
             self.fake_project.name,
         ]
         verifylist = [
@@ -519,8 +525,7 @@ class TestProjectSet(TestProject):
             'tenant_name': self.fake_project.name,
         }
         self.projects_mock.update.assert_called_with(
-            self.fake_project.id,
-            **kwargs
+            self.fake_project.id, **kwargs
         )
         self.assertIsNone(result)
 
@@ -545,8 +550,7 @@ class TestProjectSet(TestProject):
             'tenant_name': self.fake_project.name,
         }
         self.projects_mock.update.assert_called_with(
-            self.fake_project.id,
-            **kwargs
+            self.fake_project.id, **kwargs
         )
         self.assertIsNone(result)
 
@@ -571,15 +575,16 @@ class TestProjectSet(TestProject):
             'tenant_name': self.fake_project.name,
         }
         self.projects_mock.update.assert_called_with(
-            self.fake_project.id,
-            **kwargs
+            self.fake_project.id, **kwargs
         )
         self.assertIsNone(result)
 
     def test_project_set_property(self):
         arglist = [
-            '--property', 'fee=fi',
-            '--property', 'fo=fum',
+            '--property',
+            'fee=fi',
+            '--property',
+            'fo=fum',
             self.fake_project.name,
         ]
         verifylist = [
@@ -599,14 +604,12 @@ class TestProjectSet(TestProject):
             'fo': 'fum',
         }
         self.projects_mock.update.assert_called_with(
-            self.fake_project.id,
-            **kwargs
+            self.fake_project.id, **kwargs
         )
         self.assertIsNone(result)
 
 
 class TestProjectShow(TestProject):
-
     fake_proj_show = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
@@ -647,7 +650,6 @@ class TestProjectShow(TestProject):
 
 
 class TestProjectUnset(TestProject):
-
     attr = {'fee': 'fi', 'fo': 'fum'}
     fake_proj = identity_fakes.FakeProject.create_one_project(attr)
 
@@ -674,8 +676,10 @@ class TestProjectUnset(TestProject):
 
     def test_project_unset_key(self):
         arglist = [
-            '--property', 'fee',
-            '--property', 'fo',
+            '--property',
+            'fee',
+            '--property',
+            'fo',
             self.fake_proj.name,
         ]
         verifylist = [
@@ -695,7 +699,6 @@ class TestProjectUnset(TestProject):
         }
 
         self.projects_mock.update.assert_called_with(
-            self.fake_proj.id,
-            **kwargs
+            self.fake_proj.id, **kwargs
         )
         self.assertIsNone(result)
diff --git a/openstackclient/tests/unit/identity/v2_0/test_role.py b/openstackclient/tests/unit/identity/v2_0/test_role.py
index 423884d9..738982db 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_role.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_role.py
@@ -24,7 +24,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestRole(identity_fakes.TestIdentityv2):
-
     attr = {}
     attr['endpoints'] = [
         {
@@ -64,7 +63,6 @@ class TestRole(identity_fakes.TestIdentityv2):
 
 
 class TestRoleAdd(TestRole):
-
     def setUp(self):
         super(TestRoleAdd, self).setUp()
 
@@ -80,8 +78,10 @@ class TestRoleAdd(TestRole):
 
     def test_role_add(self):
         arglist = [
-            '--project', self.fake_project.name,
-            '--user', self.fake_user.name,
+            '--project',
+            self.fake_project.name,
+            '--user',
+            self.fake_user.name,
             self.fake_role.name,
         ]
         verifylist = [
@@ -113,12 +113,8 @@ class TestRoleAdd(TestRole):
 
 
 class TestRoleCreate(TestRole):
-
     fake_role_c = identity_fakes.FakeRole.create_one_role()
-    columns = (
-        'id',
-        'name'
-    )
+    columns = ('id', 'name')
     datalist = (
         fake_role_c.id,
         fake_role_c.name,
@@ -215,7 +211,6 @@ class TestRoleCreate(TestRole):
 
 
 class TestRoleDelete(TestRole):
-
     def setUp(self):
         super(TestRoleDelete, self).setUp()
 
@@ -243,8 +238,7 @@ class TestRoleDelete(TestRole):
 
     @mock.patch.object(utils, 'find_resource')
     def test_delete_multi_roles_with_exception(self, find_mock):
-        find_mock.side_effect = [self.fake_role,
-                                 exceptions.CommandError]
+        find_mock.side_effect = [self.fake_role, exceptions.CommandError]
         arglist = [
             self.fake_role.id,
             'unexist_role',
@@ -258,8 +252,7 @@ class TestRoleDelete(TestRole):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 roles failed to delete.',
-                             str(e))
+            self.assertEqual('1 of 2 roles failed to delete.', str(e))
 
         find_mock.assert_any_call(self.roles_mock, self.fake_role.id)
         find_mock.assert_any_call(self.roles_mock, 'unexist_role')
@@ -269,7 +262,6 @@ class TestRoleDelete(TestRole):
 
 
 class TestRoleList(TestRole):
-
     def setUp(self):
         super(TestRoleList, self).setUp()
 
@@ -292,15 +284,16 @@ class TestRoleList(TestRole):
 
         collist = ('ID', 'Name')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_role.id,
-            self.fake_role.name,
-        ), )
+        datalist = (
+            (
+                self.fake_role.id,
+                self.fake_role.name,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
 
 class TestRoleRemove(TestRole):
-
     def setUp(self):
         super(TestRoleRemove, self).setUp()
 
@@ -316,8 +309,10 @@ class TestRoleRemove(TestRole):
 
     def test_role_remove(self):
         arglist = [
-            '--project', self.fake_project.name,
-            '--user', self.fake_user.name,
+            '--project',
+            self.fake_project.name,
+            '--user',
+            self.fake_user.name,
             self.fake_role.name,
         ]
         verifylist = [
@@ -339,7 +334,6 @@ class TestRoleRemove(TestRole):
 
 
 class TestRoleShow(TestRole):
-
     def setUp(self):
         super(TestRoleShow, self).setUp()
 
diff --git a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
index 3e1231aa..248f689e 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
@@ -22,13 +22,11 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestRoleAssignment(identity_fakes.TestIdentityv2):
-
     def setUp(self):
         super(TestRoleAssignment, self).setUp()
 
 
 class TestRoleAssignmentList(TestRoleAssignment):
-
     columns = (
         'Role',
         'User',
@@ -74,7 +72,6 @@ class TestRoleAssignmentList(TestRoleAssignment):
         self.cmd = role_assignment.ListRoleAssignment(self.app, None)
 
     def test_role_assignment_list_no_filters(self):
-
         arglist = []
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -87,9 +84,9 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
     def test_role_assignment_list_only_project_filter(self):
-
         arglist = [
-            '--project', identity_fakes.project_name,
+            '--project',
+            identity_fakes.project_name,
         ]
         verifylist = [
             ('project', identity_fakes.project_name),
@@ -104,9 +101,9 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
     def test_role_assignment_list_only_user_filter(self):
-
         arglist = [
-            '--user', identity_fakes.user_name,
+            '--user',
+            identity_fakes.user_name,
         ]
         verifylist = [
             ('user', identity_fakes.user_name),
@@ -121,25 +118,24 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
     def test_role_assignment_list_project_and_user(self):
-
         self.roles_mock.roles_for_user.return_value = [
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE),
+                copy.deepcopy(identity_fakes.ROLE),
                 loaded=True,
             ),
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE_2),
+                copy.deepcopy(identity_fakes.ROLE_2),
                 loaded=True,
             ),
         ]
 
         arglist = [
-            '--project', identity_fakes.project_name,
-            '--user', identity_fakes.user_name,
+            '--project',
+            identity_fakes.project_name,
+            '--user',
+            identity_fakes.user_name,
         ]
         verifylist = [
             ('user', identity_fakes.user_name),
@@ -158,18 +154,21 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.user_id,
-            identity_fakes.project_id,
-        ), (identity_fakes.ROLE_2['id'],
-            identity_fakes.user_id,
-            identity_fakes.project_id,
-            ),)
+        datalist = (
+            (
+                identity_fakes.role_id,
+                identity_fakes.user_id,
+                identity_fakes.project_id,
+            ),
+            (
+                identity_fakes.ROLE_2['id'],
+                identity_fakes.user_id,
+                identity_fakes.project_id,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_def_creds(self):
-
         auth_ref = self.app.client_manager.auth_ref = mock.Mock()
         auth_ref.project_id.return_value = identity_fakes.project_id
         auth_ref.user_id.return_value = identity_fakes.user_id
@@ -177,14 +176,12 @@ class TestRoleAssignmentList(TestRoleAssignment):
         self.roles_mock.roles_for_user.return_value = [
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE),
+                copy.deepcopy(identity_fakes.ROLE),
                 loaded=True,
             ),
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE_2),
+                copy.deepcopy(identity_fakes.ROLE_2),
                 loaded=True,
             ),
         ]
@@ -210,37 +207,40 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.user_id,
-            identity_fakes.project_id,
-        ), (identity_fakes.ROLE_2['id'],
-            identity_fakes.user_id,
-            identity_fakes.project_id,
-            ),)
+        datalist = (
+            (
+                identity_fakes.role_id,
+                identity_fakes.user_id,
+                identity_fakes.project_id,
+            ),
+            (
+                identity_fakes.ROLE_2['id'],
+                identity_fakes.user_id,
+                identity_fakes.project_id,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_role_assignment_list_by_name_project_and_user(self):
-
         self.roles_mock.roles_for_user.return_value = [
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE),
+                copy.deepcopy(identity_fakes.ROLE),
                 loaded=True,
             ),
             fakes.FakeResource(
                 None,
-                copy.deepcopy(
-                    identity_fakes.ROLE_2),
+                copy.deepcopy(identity_fakes.ROLE_2),
                 loaded=True,
             ),
         ]
 
         arglist = [
-            '--project', identity_fakes.project_name,
-            '--user', identity_fakes.user_name,
-            '--names'
+            '--project',
+            identity_fakes.project_name,
+            '--user',
+            identity_fakes.user_name,
+            '--names',
         ]
         verifylist = [
             ('user', identity_fakes.user_name),
@@ -260,12 +260,16 @@ class TestRoleAssignmentList(TestRoleAssignment):
         )
 
         self.assertEqual(self.columns, columns)
-        datalist = ((
-            identity_fakes.role_name,
-            identity_fakes.user_name,
-            identity_fakes.project_name,
-        ), (identity_fakes.ROLE_2['name'],
-            identity_fakes.user_name,
-            identity_fakes.project_name,
-            ),)
+        datalist = (
+            (
+                identity_fakes.role_name,
+                identity_fakes.user_name,
+                identity_fakes.project_name,
+            ),
+            (
+                identity_fakes.ROLE_2['name'],
+                identity_fakes.user_name,
+                identity_fakes.project_name,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
diff --git a/openstackclient/tests/unit/identity/v2_0/test_service.py b/openstackclient/tests/unit/identity/v2_0/test_service.py
index 6c4374ef..844f395b 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_service.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_service.py
@@ -32,7 +32,6 @@ class TestService(identity_fakes.TestIdentityv2):
 
 
 class TestServiceCreate(TestService):
-
     fake_service_c = identity_fakes.FakeService.create_one_service()
     columns = (
         'description',
@@ -83,7 +82,8 @@ class TestServiceCreate(TestService):
 
     def test_service_create_with_name_option(self):
         arglist = [
-            '--name', self.fake_service_c.name,
+            '--name',
+            self.fake_service_c.name,
             self.fake_service_c.type,
         ]
         verifylist = [
@@ -110,8 +110,10 @@ class TestServiceCreate(TestService):
 
     def test_service_create_description(self):
         arglist = [
-            '--name', self.fake_service_c.name,
-            '--description', self.fake_service_c.description,
+            '--name',
+            self.fake_service_c.name,
+            '--description',
+            self.fake_service_c.description,
             self.fake_service_c.type,
         ]
         verifylist = [
@@ -138,7 +140,6 @@ class TestServiceCreate(TestService):
 
 
 class TestServiceDelete(TestService):
-
     def setUp(self):
         super(TestServiceDelete, self).setUp()
 
@@ -167,7 +168,6 @@ class TestServiceDelete(TestService):
 
 
 class TestServiceList(TestService):
-
     def setUp(self):
         super(TestServiceList, self).setUp()
 
@@ -190,11 +190,13 @@ class TestServiceList(TestService):
 
         collist = ('ID', 'Name', 'Type')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_service.id,
-            self.fake_service.name,
-            self.fake_service.type,
-        ), )
+        datalist = (
+            (
+                self.fake_service.id,
+                self.fake_service.name,
+                self.fake_service.type,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
     def test_service_list_long(self):
@@ -215,17 +217,18 @@ class TestServiceList(TestService):
 
         collist = ('ID', 'Name', 'Type', 'Description')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_service.id,
-            self.fake_service.name,
-            self.fake_service.type,
-            self.fake_service.description,
-        ), )
+        datalist = (
+            (
+                self.fake_service.id,
+                self.fake_service.name,
+                self.fake_service.type,
+                self.fake_service.description,
+            ),
+        )
         self.assertEqual(datalist, tuple(data))
 
 
 class TestServiceShow(TestService):
-
     fake_service_s = identity_fakes.FakeService.create_one_service()
 
     def setUp(self):
@@ -282,4 +285,6 @@ class TestServiceShow(TestService):
         except exceptions.CommandError as e:
             self.assertEqual(
                 "Multiple service matches found for 'nounique_service',"
-                " use an ID to be more specific.", str(e))
+                " use an ID to be more specific.",
+                str(e),
+            )
diff --git a/openstackclient/tests/unit/identity/v2_0/test_token.py b/openstackclient/tests/unit/identity/v2_0/test_token.py
index c079ce67..33cb0d9c 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_token.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_token.py
@@ -20,7 +20,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestToken(identity_fakes.TestIdentityv2):
-
     fake_user = identity_fakes.FakeUser.create_one_user()
     fake_project = identity_fakes.FakeProject.create_one_project()
 
@@ -33,7 +32,6 @@ class TestToken(identity_fakes.TestIdentityv2):
 
 
 class TestTokenIssue(TestToken):
-
     def setUp(self):
         super(TestTokenIssue, self).setUp()
 
@@ -94,7 +92,6 @@ class TestTokenIssue(TestToken):
 
 
 class TestTokenRevoke(TestToken):
-
     TOKEN = 'fob'
 
     def setUp(self):
diff --git a/openstackclient/tests/unit/identity/v2_0/test_user.py b/openstackclient/tests/unit/identity/v2_0/test_user.py
index c3f5f1d7..a8baf61a 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_user.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_user.py
@@ -24,7 +24,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 
 
 class TestUser(identity_fakes.TestIdentityv2):
-
     fake_project = identity_fakes.FakeProject.create_one_project()
     attr = {
         'tenantId': fake_project.id,
@@ -44,7 +43,6 @@ class TestUser(identity_fakes.TestIdentityv2):
 
 
 class TestUserCreate(TestUser):
-
     fake_project_c = identity_fakes.FakeProject.create_one_project()
     attr = {
         'tenantId': fake_project_c.id,
@@ -99,10 +97,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            None,
-            None,
-            **kwargs
+            self.fake_user_c.name, None, None, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -110,13 +105,14 @@ class TestUserCreate(TestUser):
 
     def test_user_create_password(self):
         arglist = [
-            '--password', 'secret',
+            '--password',
+            'secret',
             self.fake_user_c.name,
         ]
         verifylist = [
             ('name', self.fake_user_c.name),
             ('password_prompt', False),
-            ('password', 'secret')
+            ('password', 'secret'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -132,10 +128,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            'secret',
-            None,
-            **kwargs
+            self.fake_user_c.name, 'secret', None, **kwargs
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, data)
@@ -147,7 +140,7 @@ class TestUserCreate(TestUser):
         ]
         verifylist = [
             ('name', self.fake_user_c.name),
-            ('password_prompt', True)
+            ('password_prompt', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -166,10 +159,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            'abc123',
-            None,
-            **kwargs
+            self.fake_user_c.name, 'abc123', None, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -177,7 +167,8 @@ class TestUserCreate(TestUser):
 
     def test_user_create_email(self):
         arglist = [
-            '--email', 'barney@example.com',
+            '--email',
+            'barney@example.com',
             self.fake_user_c.name,
         ]
         verifylist = [
@@ -198,10 +189,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            None,
-            'barney@example.com',
-            **kwargs
+            self.fake_user_c.name, None, 'barney@example.com', **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -219,7 +207,8 @@ class TestUserCreate(TestUser):
         self.users_mock.create.return_value = user_2
 
         arglist = [
-            '--project', self.fake_project_c.name,
+            '--project',
+            self.fake_project_c.name,
             user_2.name,
         ]
         verifylist = [
@@ -240,10 +229,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            user_2.name,
-            None,
-            None,
-            **kwargs
+            user_2.name, None, None, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -280,10 +266,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            None,
-            None,
-            **kwargs
+            self.fake_user_c.name, None, None, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -313,10 +296,7 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            None,
-            None,
-            **kwargs
+            self.fake_user_c.name, None, None, **kwargs
         )
 
         self.assertEqual(self.columns, columns)
@@ -375,17 +355,13 @@ class TestUserCreate(TestUser):
         }
         # UserManager.create(name, password, email, tenant_id=, enabled=)
         self.users_mock.create.assert_called_with(
-            self.fake_user_c.name,
-            None,
-            None,
-            **kwargs
+            self.fake_user_c.name, None, None, **kwargs
         )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, data)
 
 
 class TestUserDelete(TestUser):
-
     def setUp(self):
         super(TestUserDelete, self).setUp()
 
@@ -414,8 +390,7 @@ class TestUserDelete(TestUser):
 
     @mock.patch.object(utils, 'find_resource')
     def test_delete_multi_users_with_exception(self, find_mock):
-        find_mock.side_effect = [self.fake_user,
-                                 exceptions.CommandError]
+        find_mock.side_effect = [self.fake_user, exceptions.CommandError]
         arglist = [
             self.fake_user.id,
             'unexist_user',
@@ -429,8 +404,7 @@ class TestUserDelete(TestUser):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 users failed to delete.',
-                             str(e))
+            self.assertEqual('1 of 2 users failed to delete.', str(e))
 
         find_mock.assert_any_call(self.users_mock, self.fake_user.id)
         find_mock.assert_any_call(self.users_mock, 'unexist_user')
@@ -440,7 +414,6 @@ class TestUserDelete(TestUser):
 
 
 class TestUserList(TestUser):
-
     fake_project_l = identity_fakes.FakeProject.create_one_project()
     attr = {
         'tenantId': fake_project_l.id,
@@ -486,7 +459,8 @@ class TestUserList(TestUser):
 
     def test_user_list_project(self):
         arglist = [
-            '--project', self.fake_project_l.id,
+            '--project',
+            self.fake_project_l.id,
         ]
         verifylist = [
             ('project', self.fake_project_l.id),
@@ -522,20 +496,22 @@ class TestUserList(TestUser):
 
         collist = ('ID', 'Name', 'Project', 'Email', 'Enabled')
         self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_user_l.id,
-            self.fake_user_l.name,
-            user.ProjectColumn(
-                self.fake_project_l.id,
-                {self.fake_project_l.id: self.fake_project_l}),
-            self.fake_user_l.email,
-            True,
-        ), )
+        datalist = (
+            (
+                self.fake_user_l.id,
+                self.fake_user_l.name,
+                user.ProjectColumn(
+                    self.fake_project_l.id,
+                    {self.fake_project_l.id: self.fake_project_l},
+                ),
+                self.fake_user_l.email,
+                True,
+            ),
+        )
         self.assertCountEqual(datalist, tuple(data))
 
 
 class TestUserSet(TestUser):
-
     def setUp(self):
         super(TestUserSet, self).setUp()
 
@@ -583,11 +559,13 @@ class TestUserSet(TestUser):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args)
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
 
     def test_user_set_name(self):
         arglist = [
-            '--name', 'qwerty',
+            '--name',
+            'qwerty',
             self.fake_user.name,
         ]
         verifylist = [
@@ -609,15 +587,13 @@ class TestUserSet(TestUser):
             'name': 'qwerty',
         }
         # UserManager.update(user, **kwargs)
-        self.users_mock.update.assert_called_with(
-            self.fake_user.id,
-            **kwargs
-        )
+        self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs)
         self.assertIsNone(result)
 
     def test_user_set_password(self):
         arglist = [
-            '--password', 'secret',
+            '--password',
+            'secret',
             self.fake_user.name,
         ]
         verifylist = [
@@ -672,7 +648,8 @@ class TestUserSet(TestUser):
 
     def test_user_set_email(self):
         arglist = [
-            '--email', 'barney@example.com',
+            '--email',
+            'barney@example.com',
             self.fake_user.name,
         ]
         verifylist = [
@@ -694,15 +671,13 @@ class TestUserSet(TestUser):
             'enabled': True,
         }
         # UserManager.update(user, **kwargs)
-        self.users_mock.update.assert_called_with(
-            self.fake_user.id,
-            **kwargs
-        )
+        self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs)
         self.assertIsNone(result)
 
     def test_user_set_project(self):
         arglist = [
-            '--project', self.fake_project.id,
+            '--project',
+            self.fake_project.id,
             self.fake_user.name,
         ]
         verifylist = [
@@ -748,10 +723,7 @@ class TestUserSet(TestUser):
             'enabled': True,
         }
         # UserManager.update(user, **kwargs)
-        self.users_mock.update.assert_called_with(
-            self.fake_user.id,
-            **kwargs
-        )
+        self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs)
         self.assertIsNone(result)
 
     def test_user_set_disable(self):
@@ -777,15 +749,11 @@ class TestUserSet(TestUser):
             'enabled': False,
         }
         # UserManager.update(user, **kwargs)
-        self.users_mock.update.assert_called_with(
-            self.fake_user.id,
-            **kwargs
-        )
+        self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs)
         self.assertIsNone(result)
 
 
 class TestUserShow(TestUser):
-
     def setUp(self):
         super(TestUserShow, self).setUp()