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>

Author: stephenfin

openstackclient/identity/client.py

@@ -43,18 +43,15 @@
 def make_client(instance):
     """Returns an identity service client."""
     identity_client = utils.get_client_class(
-        API_NAME,
-        instance._api_version[API_NAME],
-        API_VERSIONS)
+        API_NAME, instance._api_version[API_NAME], API_VERSIONS
+    )
     LOG.debug('Instantiating identity client: %s', identity_client)
 
     # Remember interface only if interface is set
     kwargs = utils.build_kwargs_dict('interface', instance.interface)
 
     client = identity_client(
-        session=instance.session,
-        region_name=instance.region_name,
-        **kwargs
+        session=instance.session, region_name=instance.region_name, **kwargs
     )
 
     return client
@@ -66,8 +63,11 @@ def build_option_parser(parser):
         '--os-identity-api-version',
         metavar='<identity-api-version>',
         default=utils.env('OS_IDENTITY_API_VERSION'),
-        help=_('Identity API version, default=%s '
-               '(Env: OS_IDENTITY_API_VERSION)') % DEFAULT_API_VERSION,
+        help=_(
+            'Identity API version, default=%s '
+            '(Env: OS_IDENTITY_API_VERSION)'
+        )
+        % DEFAULT_API_VERSION,
     )
     return parser
 

openstackclient/identity/common.py

@@ -33,7 +33,8 @@ def find_service_in_list(service_list, service_id):
         if service.id == service_id:
             return service
     raise exceptions.CommandError(
-        "No service with a type, name or ID of '%s' exists." % service_id)
+        "No service with a type, name or ID of '%s' exists." % service_id
+    )
 
 
 def find_service(identity_client, name_type_or_id):
@@ -52,8 +53,10 @@ def find_service(identity_client, name_type_or_id):
     except identity_exc.NotFound:
         pass
     except identity_exc.NoUniqueMatch:
-        msg = _("Multiple service matches found for '%s', "
-                "use an ID to be more specific.")
+        msg = _(
+            "Multiple service matches found for '%s', "
+            "use an ID to be more specific."
+        )
         raise exceptions.CommandError(msg % name_type_or_id)
 
     try:
@@ -63,8 +66,10 @@ def find_service(identity_client, name_type_or_id):
         msg = _("No service with a type, name or ID of '%s' exists.")
         raise exceptions.CommandError(msg % name_type_or_id)
     except identity_exc.NoUniqueMatch:
-        msg = _("Multiple service matches found for '%s', "
-                "use an ID to be more specific.")
+        msg = _(
+            "Multiple service matches found for '%s', "
+            "use an ID to be more specific."
+        )
         raise exceptions.CommandError(msg % name_type_or_id)
 
 
@@ -141,42 +146,56 @@ def _get_domain_id_if_requested(identity_client, domain_name_or_id):
 
 
 def find_domain(identity_client, name_or_id):
-    return _find_identity_resource(identity_client.domains, name_or_id,
-                                   domains.Domain)
+    return _find_identity_resource(
+        identity_client.domains, name_or_id, domains.Domain
+    )
 
 
 def find_group(identity_client, name_or_id, domain_name_or_id=None):
     domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
     if not domain_id:
-        return _find_identity_resource(identity_client.groups, name_or_id,
-                                       groups.Group)
+        return _find_identity_resource(
+            identity_client.groups, name_or_id, groups.Group
+        )
     else:
-        return _find_identity_resource(identity_client.groups, name_or_id,
-                                       groups.Group, domain_id=domain_id)
+        return _find_identity_resource(
+            identity_client.groups,
+            name_or_id,
+            groups.Group,
+            domain_id=domain_id,
+        )
 
 
 def find_project(identity_client, name_or_id, domain_name_or_id=None):
     domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
     if not domain_id:
-        return _find_identity_resource(identity_client.projects, name_or_id,
-                                       projects.Project)
+        return _find_identity_resource(
+            identity_client.projects, name_or_id, projects.Project
+        )
     else:
-        return _find_identity_resource(identity_client.projects, name_or_id,
-                                       projects.Project, domain_id=domain_id)
+        return _find_identity_resource(
+            identity_client.projects,
+            name_or_id,
+            projects.Project,
+            domain_id=domain_id,
+        )
 
 
 def find_user(identity_client, name_or_id, domain_name_or_id=None):
     domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
     if not domain_id:
-        return _find_identity_resource(identity_client.users, name_or_id,
-                                       users.User)
+        return _find_identity_resource(
+            identity_client.users, name_or_id, users.User
+        )
     else:
-        return _find_identity_resource(identity_client.users, name_or_id,
-                                       users.User, domain_id=domain_id)
+        return _find_identity_resource(
+            identity_client.users, name_or_id, users.User, domain_id=domain_id
+        )
 
 
-def _find_identity_resource(identity_client_manager, name_or_id,
-                            resource_type, **kwargs):
+def _find_identity_resource(
+    identity_client_manager, name_or_id, resource_type, **kwargs
+):
     """Find a specific identity resource.
 
     Using keystoneclient's manager, attempt to find a specific resource by its
@@ -203,8 +222,9 @@ def _find_identity_resource(identity_client_manager, name_or_id,
     """
 
     try:
-        identity_resource = utils.find_resource(identity_client_manager,
-                                                name_or_id, **kwargs)
+        identity_resource = utils.find_resource(
+            identity_client_manager, name_or_id, **kwargs
+        )
         if identity_resource is not None:
             return identity_resource
     except (exceptions.Forbidden, identity_exc.Forbidden):
@@ -226,39 +246,49 @@ def add_user_domain_option_to_parser(parser):
     parser.add_argument(
         '--user-domain',
         metavar='<user-domain>',
-        help=_('Domain the user belongs to (name or ID). '
-               'This can be used in case collisions between user names '
-               'exist.'),
+        help=_(
+            'Domain the user belongs to (name or ID). '
+            'This can be used in case collisions between user names '
+            'exist.'
+        ),
     )
 
 
 def add_group_domain_option_to_parser(parser):
     parser.add_argument(
         '--group-domain',
         metavar='<group-domain>',
-        help=_('Domain the group belongs to (name or ID). '
-               'This can be used in case collisions between group names '
-               'exist.'),
+        help=_(
+            'Domain the group belongs to (name or ID). '
+            'This can be used in case collisions between group names '
+            'exist.'
+        ),
     )
 
 
 def add_project_domain_option_to_parser(parser, enhance_help=lambda _h: _h):
     parser.add_argument(
         '--project-domain',
         metavar='<project-domain>',
-        help=enhance_help(_('Domain the project belongs to (name or ID). This '
-                            'can be used in case collisions between project '
-                            'names exist.')),
+        help=enhance_help(
+            _(
+                'Domain the project belongs to (name or ID). This '
+                'can be used in case collisions between project '
+                'names exist.'
+            )
+        ),
     )
 
 
 def add_role_domain_option_to_parser(parser):
     parser.add_argument(
         '--role-domain',
         metavar='<role-domain>',
-        help=_('Domain the role belongs to (name or ID). '
-               'This must be specified when the name of a domain specific '
-               'role is used.'),
+        help=_(
+            'Domain the role belongs to (name or ID). '
+            'This must be specified when the name of a domain specific '
+            'role is used.'
+        ),
     )
 
 
@@ -267,8 +297,9 @@ def add_inherited_option_to_parser(parser):
         '--inherited',
         action='store_true',
         default=False,
-        help=_('Specifies if the role grant is inheritable to the sub '
-               'projects'),
+        help=_(
+            'Specifies if the role grant is inheritable to the sub ' 'projects'
+        ),
     )
 
 
@@ -277,8 +308,10 @@ def add_resource_option_to_parser(parser):
     enable_group.add_argument(
         '--immutable',
         action='store_true',
-        help=_('Make resource immutable. An immutable project may not '
-               'be deleted or modified except to remove the immutable flag'),
+        help=_(
+            'Make resource immutable. An immutable project may not '
+            'be deleted or modified except to remove the immutable flag'
+        ),
     )
     enable_group.add_argument(
         '--no-immutable',

openstackclient/identity/v2_0/catalog.py

@@ -47,7 +47,6 @@ class ListCatalog(command.Lister):
     _description = _("List services in the service catalog")
 
     def take_action(self, parsed_args):
-
         # Trigger auth if it has not happened yet
         auth_ref = self.app.client_manager.auth_ref
         if not auth_ref:
@@ -57,13 +56,19 @@ def take_action(self, parsed_args):
 
         data = auth_ref.service_catalog.catalog
         columns = ('Name', 'Type', 'Endpoints')
-        return (columns,
-                (utils.get_dict_properties(
-                    s, columns,
+        return (
+            columns,
+            (
+                utils.get_dict_properties(
+                    s,
+                    columns,
                     formatters={
                         'Endpoints': EndpointsColumn,
                     },
-                ) for s in data))
+                )
+                for s in data
+            ),
+        )
 
 
 class ShowCatalog(command.ShowOne):
@@ -79,7 +84,6 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, parsed_args):
-
         # Trigger auth if it has not happened yet
         auth_ref = self.app.client_manager.auth_ref
         if not auth_ref:
@@ -89,8 +93,10 @@ def take_action(self, parsed_args):
 
         data = None
         for service in auth_ref.service_catalog.catalog:
-            if (service.get('name') == parsed_args.service or
-                    service.get('type') == parsed_args.service):
+            if (
+                service.get('name') == parsed_args.service
+                or service.get('type') == parsed_args.service
+            ):
                 data = service.copy()
                 data['endpoints'] = EndpointsColumn(data['endpoints'])
                 if 'endpoints_links' in data:

openstackclient/identity/v2_0/ec2creds.py

@@ -77,9 +77,7 @@ def take_action(self, parsed_args):
         info.update(creds._info)
 
         if 'tenant_id' in info:
-            info.update(
-                {'project_id': info.pop('tenant_id')}
-            )
+            info.update({'project_id': info.pop('tenant_id')})
 
         return zip(*sorted(info.items()))
 
@@ -120,14 +118,19 @@ def take_action(self, parsed_args):
                 identity_client.ec2.delete(user, access_key)
             except Exception as e:
                 result += 1
-                LOG.error(_("Failed to delete EC2 credentials with "
-                          "access key '%(access_key)s': %(e)s"),
-                          {'access_key': access_key, 'e': e})
+                LOG.error(
+                    _(
+                        "Failed to delete EC2 credentials with "
+                        "access key '%(access_key)s': %(e)s"
+                    ),
+                    {'access_key': access_key, 'e': e},
+                )
 
         if result > 0:
             total = len(parsed_args.access_keys)
-            msg = (_("%(result)s of %(total)s EC2 keys failed "
-                   "to delete.") % {'result': result, 'total': total})
+            msg = _(
+                "%(result)s of %(total)s EC2 keys failed " "to delete."
+            ) % {'result': result, 'total': total}
             raise exceptions.CommandError(msg)
 
 
@@ -159,11 +162,17 @@ def take_action(self, parsed_args):
         column_headers = ('Access', 'Secret', 'Project ID', 'User ID')
         data = identity_client.ec2.list(user)
 
-        return (column_headers,
-                (utils.get_item_properties(
-                    s, columns,
+        return (
+            column_headers,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
                     formatters={},
-                ) for s in data))
+                )
+                for s in data
+            ),
+        )
 
 
 class ShowEC2Creds(command.ShowOne):
@@ -201,8 +210,6 @@ def take_action(self, parsed_args):
         info.update(creds._info)
 
         if 'tenant_id' in info:
-            info.update(
-                {'project_id': info.pop('tenant_id')}
-            )
+            info.update({'project_id': info.pop('tenant_id')})
 
         return zip(*sorted(info.items()))