Merge "trivial: Enable ruff-specific (RUF) rules"

Author: Zuul

openstackclient/api/api.py

@@ -254,7 +254,7 @@ def find_bulk(self, path, **kwargs):
         items = self.list(path)
         if isinstance(items, dict):
             # strip off the enclosing dict
-            key = list(items.keys())[0]
+            key = next(iter(items.keys()))
             items = items[key]
 
         ret = []

openstackclient/common/progressbar.py

@@ -40,7 +40,7 @@ def _display_progress_bar(self, size_read):
             # Output something like this: [==========>             ] 49%
             sys.stdout.write(
                 '\r[{:<30}] {:.0%}'.format(
-                    '=' * int(round(self._percent * 29)) + '>', self._percent
+                    '=' * round(self._percent * 29) + '>', self._percent
                 )
             )
             sys.stdout.flush()

openstackclient/common/quota.py

@@ -827,13 +827,11 @@ def _normalize_names(section: dict) -> None:
             _normalize_names(info["usage"])
 
         # Remove the 'id' field since it's not very useful
-        if 'id' in info:
-            del info['id']
+        info.pop('id', None)
 
         # Remove the sdk-derived fields
         for field in ('location', 'name', 'force'):
-            if field in info:
-                del info[field]
+            info.pop(field, None)
 
         if not parsed_args.usage:
             result = [{'resource': k, 'limit': v} for k, v in info.items()]

openstackclient/compute/v2/server.py

@@ -940,9 +940,9 @@ def __call__(self, parser, namespace, values, option_string=None):
         }
 
         for kv_str in values.split(','):
-            k, sep, v = kv_str.partition('=')
+            k, _sep, v = kv_str.partition('=')
 
-            if k not in list(info) + ['tag'] or not v:
+            if k not in [*list(info), 'tag'] or not v:
                 msg = _(
                     "Invalid argument %s; argument must be of form "
                     "'net-id=net-uuid,port-id=port-uuid,v4-fixed-ip=ip-addr,"
@@ -975,7 +975,7 @@ def __call__(self, parser, namespace, values, option_string=None):
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        dev_name, sep, dev_map = values.partition('=')
+        dev_name, _sep, dev_map = values.partition('=')
         dev_map = dev_map.split(':') if dev_map else dev_map
         if not dev_name or not dev_map or len(dev_map) > 4:
             msg = _(
@@ -5017,7 +5017,7 @@ def take_action(self, parsed_args):
             ip_address_family,
         )
 
-        cmd = ' '.join(['ssh', ip_address] + args)
+        cmd = ' '.join(['ssh', ip_address, *args])
         LOG.debug('ssh command: %s', cmd)
         # we intentionally pass through user-provided arguments and run this in
         # the user's shell

openstackclient/identity/common.py

@@ -180,7 +180,7 @@ def _get_token_resource(client, resource, parsed_name, parsed_domain=None):
             return parsed_name
         return obj['id'] if obj['name'] == parsed_name else parsed_name
     # diaper defense in case parsing the token fails
-    except Exception:  # noqa
+    except Exception:
         return parsed_name
 
 

openstackclient/identity/v2_0/role_assignment.py

@@ -17,7 +17,7 @@
 from osc_lib import utils
 
 from openstackclient import command
-from openstackclient.i18n import _  # noqa
+from openstackclient.i18n import _
 
 
 class ListRoleAssignment(command.Lister):

openstackclient/identity/v3/identity_provider.py

@@ -188,13 +188,13 @@ def get_parser(self, prog_name):
         parser.add_argument(
             '--id',
             metavar='<id>',
-            help=_('The Identity Providers’ ID attribute'),
+            help=_('Filter identity providers by ID'),
         )
         parser.add_argument(
             '--enabled',
             dest='enabled',
             action='store_true',
-            help=_('The Identity Providers that are enabled will be returned'),
+            help=_('List only enabled identity providers'),
         )
         return parser
 

openstackclient/identity/v3/role.py

@@ -416,8 +416,10 @@ def take_action(self, parsed_args):
             return (
                 ('ID', 'Name', 'Domain'),
                 (
-                    utils.get_item_properties(s, ('id', 'name'))
-                    + (domain.name,)
+                    (
+                        *utils.get_item_properties(s, ('id', 'name')),
+                        domain.name,
+                    )
                     for s in data
                 ),
             )

openstackclient/image/v1/image.py

@@ -299,7 +299,7 @@ def take_action(self, parsed_args):
                     volume_client.volumes,
                     parsed_args.volume,
                 )
-                response, body = volume_client.volumes.upload_to_image(
+                _response, body = volume_client.volumes.upload_to_image(
                     source_volume.id,
                     parsed_args.force,
                     parsed_args.name,
@@ -498,7 +498,7 @@ def take_action(self, parsed_args):
 
         if parsed_args.property:
             # NOTE(dtroyer): coerce to a list to subscript it in py3
-            attr, value = list(parsed_args.property.items())[0]
+            attr, value = next(iter(parsed_args.property.items()))
             api_utils.simple_filter(
                 images,
                 attr=attr,

openstackclient/network/utils.py

@@ -78,7 +78,7 @@ def str2dict(strdict: str) -> dict[str, str]:
         else:
             kvlist[i - 1] = f"{kvlist[i - 1]};{kv}"
     for kv in kvlist:
-        key, sep, value = kv.partition(':')
+        key, value = kv.split(':', 1)
         result[key] = value
     return result
 
@@ -173,11 +173,15 @@ def is_ipv6_protocol(protocol):
     # However, while the OSC CLI doesn't document the protocol,
     # the code must still handle it. In addition, handle both
     # protocol names and numbers.
-    if (
-        protocol is not None
-        and protocol.startswith('ipv6-')
-        or protocol in ['icmpv6', '41', '43', '44', '58', '59', '60']
-    ):
+    if (protocol is not None and protocol.startswith('ipv6-')) or protocol in [
+        'icmpv6',
+        '41',
+        '43',
+        '44',
+        '58',
+        '59',
+        '60',
+    ]:
         return True
     else:
         return False