osc-lib 3.0.1__py3-none-any.whl → 3.2.0__py3-none-any.whl

osc_lib/api/api.py

@@ -15,13 +15,13 @@
 
 from keystoneauth1 import exceptions as ksa_exceptions
 from keystoneauth1 import session as ksa_session
-import simplejson as json
+import requests
 
 from osc_lib import exceptions
 from osc_lib.i18n import _
 
 
-class BaseAPI(object):
+class BaseAPI:
     """Base API wrapper for keystoneauth1.session.Session
 
     Encapsulate the translation between keystoneauth1.session.Session
@@ -58,7 +58,7 @@ class BaseAPI(object):
             Keyword arguments passed to keystoneauth1.session.Session().
         """
 
-        super(BaseAPI, self).__init__()
+        super().__init__()
 
         # Create a keystoneauth1.session.Session if one is not supplied
         if not session:
@@ -153,7 +153,7 @@ class BaseAPI(object):
         # Should this move into _requests()?
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     def delete(self, url, session=None, **params):
@@ -174,7 +174,7 @@ class BaseAPI(object):
         body=None,
         detailed=False,
         headers=None,
-        **params
+        **params,
     ):
         """Return a list of resources
 
@@ -218,7 +218,7 @@ class BaseAPI(object):
             )
         try:
             return ret.json()
-        except json.JSONDecodeError:
+        except requests.JSONDecodeError:
             return ret
 
     # Layered actions built on top of the basic action methods do not
@@ -363,7 +363,7 @@ class BaseAPI(object):
         try:
             ret = self._request(
                 'GET',
-                "/%s/%s" % (path, value),
+                f"/{path}/{value}",
                 headers=headers,
             ).json()
             if isinstance(ret, dict):

osc_lib/api/auth.py

@@ -59,9 +59,8 @@ def get_options_list():
                 # TODO(mhu) simplistic approach, would be better to only add
                 # help texts if they vary from one auth plugin to another
                 # also the text rendering is ugly in the CLI ...
-                OPTIONS_LIST[os_name]['help'] += 'With %s: %s\n' % (
-                    plugin_name,
-                    o.help,
+                OPTIONS_LIST[os_name]['help'] += (
+                    f'With {plugin_name}: {o.help}\n'
                 )
     return OPTIONS_LIST
 
@@ -177,7 +176,7 @@ def build_auth_plugins_option_parser(parser):
         if 'tenant' not in o:
             parser.add_argument(
                 '--os-' + o,
-                metavar='<auth-%s>' % o,
+                metavar=f'<auth-{o}>',
                 dest=o.replace('-', '_'),
                 default=envs.get(
                     OPTIONS_LIST[o]['env'],

osc_lib/cli/client_config.py

@@ -56,7 +56,7 @@ class OSC_Config(config.OpenStackConfig):
             if not config.get('auth_type', None):
                 config['auth_type'] = 'password'
 
-        LOG.debug("Auth plugin %s selected" % config['auth_type'])
+        LOG.debug("Auth plugin {} selected".format(config['auth_type']))
         return config
 
     def _auth_v2_arguments(self, config):
@@ -94,14 +94,15 @@ class OSC_Config(config.OpenStackConfig):
                 if config['auth'].pop(prop, None) is not None:
                     if config.get('cloud'):
                         LOG.warning(
-                            "Ignoring domain related config %s for %s"
-                            "because identity API version is 2.0"
-                            % (prop, config['cloud'])
+                            "Ignoring domain related config {} for {}"
+                            "because identity API version is 2.0".format(
+                                prop, config['cloud']
+                            )
                         )
                     else:
                         LOG.warning(
-                            "Ignoring domain related config %s because"
-                            " identity API version is 2.0" % prop
+                            f"Ignoring domain related config {prop} because"
+                            " identity API version is 2.0"
                         )
         return config
 
@@ -204,9 +205,9 @@ class OSC_Config(config.OpenStackConfig):
                 # Prefer the plugin configuration dest value if the value's key
                 # is marked as depreciated.
                 if p_opt.dest is None:
-                    config['auth'][
-                        p_opt.name.replace('-', '_')
-                    ] = winning_value
+                    config['auth'][p_opt.name.replace('-', '_')] = (
+                        winning_value
+                    )
                 else:
                     config['auth'][p_opt.dest] = winning_value
 

osc_lib/cli/parseractions.py

@@ -37,12 +37,12 @@ class KeyValueAction(argparse.Action):
             # NOTE(qtang): Prevent null key setting in property
             if '' == values_list[0]:
                 msg = _("Property key must be specified: %s")
-                raise argparse.ArgumentTypeError(msg % str(values))
+                raise argparse.ArgumentError(self, msg % str(values))
             else:
                 getattr(namespace, self.dest, {}).update([values_list])
         else:
             msg = _("Expected 'key=value' type, but got: %s")
-            raise argparse.ArgumentTypeError(msg % str(values))
+            raise argparse.ArgumentError(self, msg % str(values))
 
 
 class KeyValueAppendAction(argparse.Action):
@@ -62,7 +62,7 @@ class KeyValueAppendAction(argparse.Action):
             # NOTE(qtang): Prevent null key setting in property
             if '' == key:
                 msg = _("Property key must be specified: %s")
-                raise argparse.ArgumentTypeError(msg % str(values))
+                raise argparse.ArgumentError(self, msg % str(values))
 
             dest = getattr(namespace, self.dest)
             if key in dest:
@@ -71,7 +71,7 @@ class KeyValueAppendAction(argparse.Action):
                 dest[key] = [value]
         else:
             msg = _("Expected 'key=value' type, but got: %s")
-            raise argparse.ArgumentTypeError(msg % str(values))
+            raise argparse.ArgumentError(self, msg % str(values))
 
 
 class MultiKeyValueAction(argparse.Action):
@@ -91,7 +91,7 @@ class MultiKeyValueAction(argparse.Action):
         nargs=None,
         required_keys=None,
         optional_keys=None,
-        **kwargs
+        **kwargs,
     ):
         """Initialize the action object, and parse customized options
 
@@ -106,9 +106,7 @@ class MultiKeyValueAction(argparse.Action):
             msg = _("Parameter 'nargs' is not allowed, but got %s")
             raise ValueError(msg % nargs)
 
-        super(MultiKeyValueAction, self).__init__(
-            option_strings, dest, **kwargs
-        )
+        super().__init__(option_strings, dest, **kwargs)
 
         # required_keys: A list of keys that is required. None by default.
         if required_keys and not isinstance(required_keys, list):
@@ -136,12 +134,13 @@ class MultiKeyValueAction(argparse.Action):
                     "Invalid keys %(invalid_keys)s specified.\n"
                     "Valid keys are: %(valid_keys)s"
                 )
-                raise argparse.ArgumentTypeError(
+                raise argparse.ArgumentError(
+                    self,
                     msg
                     % {
                         'invalid_keys': ', '.join(invalid_keys),
                         'valid_keys': ', '.join(valid_keys),
-                    }
+                    },
                 )
 
         if self.required_keys:
@@ -151,12 +150,13 @@ class MultiKeyValueAction(argparse.Action):
                     "Missing required keys %(missing_keys)s.\n"
                     "Required keys are: %(required_keys)s"
                 )
-                raise argparse.ArgumentTypeError(
+                raise argparse.ArgumentError(
+                    self,
                     msg
                     % {
                         'missing_keys': ', '.join(missing_keys),
                         'required_keys': ', '.join(self.required_keys),
-                    }
+                    },
                 )
 
     def __call__(self, parser, namespace, values, metavar=None):
@@ -166,20 +166,20 @@ class MultiKeyValueAction(argparse.Action):
 
         params = {}
         for kv in values.split(','):
-            # Add value if an assignment else raise ArgumentTypeError
+            # Add value if an assignment else raise ArgumentError
             if '=' in kv:
                 kv_list = kv.split('=', 1)
                 # NOTE(qtang): Prevent null key setting in property
                 if '' == kv_list[0]:
                     msg = _("Each property key must be specified: %s")
-                    raise argparse.ArgumentTypeError(msg % str(kv))
+                    raise argparse.ArgumentError(self, msg % str(kv))
                 else:
                     params.update([kv_list])
             else:
                 msg = _(
                     "Expected comma separated 'key=value' pairs, but got: %s"
                 )
-                raise argparse.ArgumentTypeError(msg % str(kv))
+                raise argparse.ArgumentError(self, msg % str(kv))
 
         # Check key validation
         self.validate_keys(list(params))
@@ -209,13 +209,13 @@ class MultiKeyValueCommaAction(MultiKeyValueAction):
         params = {}
         key = ''
         for kv in values.split(','):
-            # Add value if an assignment else raise ArgumentTypeError
+            # Add value if an assignment else raise ArgumentError
             if '=' in kv:
                 kv_list = kv.split('=', 1)
                 # NOTE(qtang): Prevent null key setting in property
                 if '' == kv_list[0]:
                     msg = _("A key must be specified before '=': %s")
-                    raise argparse.ArgumentTypeError(msg % str(kv))
+                    raise argparse.ArgumentError(self, msg % str(kv))
                 else:
                     params.update([kv_list])
                 key = kv_list[0]
@@ -224,10 +224,10 @@ class MultiKeyValueCommaAction(MultiKeyValueAction):
                 # means the current value is a part of the previous
                 # key=value pair, so append it.
                 try:
-                    params[key] = "%s,%s" % (params[key], kv)
+                    params[key] = f"{params[key]},{kv}"
                 except KeyError:
                     msg = _("A key=value pair is required: %s")
-                    raise argparse.ArgumentTypeError(msg % str(kv))
+                    raise argparse.ArgumentError(self, msg % str(kv))
 
         # Check key validation
         self.validate_keys(list(params))
@@ -284,4 +284,4 @@ class NonNegativeAction(argparse.Action):
             setattr(namespace, self.dest, values)
         else:
             msg = _("%s expected a non-negative integer")
-            raise argparse.ArgumentTypeError(msg % str(option_string))
+            raise argparse.ArgumentError(self, msg % str(option_string))

osc_lib/clientmanager.py

@@ -31,7 +31,7 @@ LOG = logging.getLogger(__name__)
 PLUGIN_MODULES = []
 
 
-class ClientCache(object):
+class ClientCache:
     """Descriptor class for caching created client handles."""
 
     def __init__(self, factory):
@@ -50,7 +50,7 @@ class ClientCache(object):
         return self._handle
 
 
-class ClientManager(object):
+class ClientManager:
     """Manages access to API clients, including authentication."""
 
     # NOTE(dtroyer): Keep around the auth required state of the _current_
@@ -150,7 +150,7 @@ class ClientManager(object):
         ) and not self._cli_options.auth.get('password'):
             self._cli_options.auth['password'] = self._pw_callback()
 
-        LOG.info('Using auth plugin: %s', self.auth_plugin_name)
+        LOG.debug('Using auth plugin: %s', self.auth_plugin_name)
         LOG.debug(
             'Using parameters %s',
             strutils.mask_password(self._cli_options.auth),
@@ -209,7 +209,7 @@ class ClientManager(object):
         return self._auth_ref
 
     def _override_for(self, service_type):
-        key = '%s_endpoint_override' % service_type.replace('-', '_')
+        key = '{}_endpoint_override'.format(service_type.replace('-', '_'))
         return self._cli_options.config.get(key)
 
     def is_service_available(self, service_type):

osc_lib/command/command.py

@@ -29,13 +29,13 @@ class CommandMeta(abc.ABCMeta):
             cls_dict['log'] = logging.getLogger(
                 cls_dict['__module__'] + '.' + name
             )
-        return super(CommandMeta, mcs).__new__(mcs, name, bases, cls_dict)
+        return super().__new__(mcs, name, bases, cls_dict)
 
 
 class Command(command.Command, metaclass=CommandMeta):
     def run(self, parsed_args):
         self.log.debug('run(%s)', parsed_args)
-        return super(Command, self).run(parsed_args)
+        return super().run(parsed_args)
 
     def validate_os_beta_command_enabled(self):
         if not self.app.options.os_beta_command:

osc_lib/exceptions.py

@@ -68,7 +68,7 @@ class ClientException(Exception):
         self.details = details
 
     def __str__(self):
-        return "%s (HTTP %s)" % (self.message, self.code)
+        return f"{self.message} (HTTP {self.code})"
 
 
 class BadRequest(ClientException):

osc_lib/logs.py

@@ -114,7 +114,7 @@ class _FileFormatter(logging.Formatter):
         logging.Formatter.__init__(self, self.fmt, self._LOG_DATE_FORMAT)
 
 
-class LogConfigurator(object):
+class LogConfigurator:
     _CONSOLE_MESSAGE_FORMAT = '%(message)s'
 
     def __init__(self, options):

osc_lib/shell.py

@@ -107,7 +107,7 @@ class OpenStackShell(app.App):
         else:
             cm = command_manager
 
-        super(OpenStackShell, self).__init__(
+        super().__init__(
             description=__doc__.strip(),
             version=version,
             command_manager=cm,
@@ -134,7 +134,7 @@ class OpenStackShell(app.App):
         ret_val = 1
         self.command_options = argv
         try:
-            ret_val = super(OpenStackShell, self).run(argv)
+            ret_val = super().run(argv)
             return ret_val
         except Exception as e:
             if not logging.getLogger('').handlers:
@@ -147,7 +147,7 @@ class OpenStackShell(app.App):
             return ret_val
 
         finally:
-            self.log.info("END return value: %s", ret_val)
+            self.log.debug("END return value: %s", ret_val)
 
     def init_profile(self):
         self.do_profile = osprofiler_profiler and self.options.profile
@@ -165,20 +165,19 @@ class OpenStackShell(app.App):
             # printed. In fact we can define custom log level here with value
             # bigger than most big default one (CRITICAL) or something like
             # that (PROFILE = 60 for instance), but not sure we need it here.
-            self.log.warning("Trace ID: %s" % trace_id)
+            self.log.warning(f"Trace ID: {trace_id}")
             self.log.warning(
-                "Short trace ID "
-                "for OpenTracing-based drivers: %s" % short_id
+                "Short trace ID " f"for OpenTracing-based drivers: {short_id}"
             )
             self.log.warning(
                 "Display trace data with command:\n"
-                "osprofiler trace show --html %s " % trace_id
+                f"osprofiler trace show --html {trace_id} "
             )
 
     def run_subcommand(self, argv):
         self.init_profile()
         try:
-            ret_value = super(OpenStackShell, self).run_subcommand(argv)
+            ret_value = super().run_subcommand(argv)
         finally:
             self.close_profile()
         return ret_value
@@ -186,15 +185,13 @@ class OpenStackShell(app.App):
     def interact(self):
         self.init_profile()
         try:
-            ret_value = super(OpenStackShell, self).interact()
+            ret_value = super().interact()
         finally:
             self.close_profile()
         return ret_value
 
     def build_option_parser(self, description, version):
-        parser = super(OpenStackShell, self).build_option_parser(
-            description, version
-        )
+        parser = super().build_option_parser(description, version)
 
         # service token auth argument
         parser.add_argument(
@@ -416,7 +413,7 @@ class OpenStackShell(app.App):
         """
 
         # Parent __init__ parses argv into self.options
-        super(OpenStackShell, self).initialize_app(argv)
+        super().initialize_app(argv)
         self.log.info(
             "START with options: %s",
             strutils.mask_password(" ".join(self.command_options)),
@@ -435,7 +432,7 @@ class OpenStackShell(app.App):
                     'auth_type': self._auth_type,
                 },
             )
-        except (IOError, OSError) as e:
+        except OSError as e:
             self.log.critical("Could not read clouds.yaml configuration file")
             self.print_help_if_requested()
             raise e
@@ -478,7 +475,7 @@ class OpenStackShell(app.App):
 
     def prepare_to_run_command(self, cmd):
         """Set up auth and API versions"""
-        self.log.info(
+        self.log.debug(
             'command: %s -> %s.%s (auth=%s)',
             getattr(cmd, 'cmd_name', '<none>'),
             cmd.__class__.__module__,

osc_lib/tests/api/fakes.py

@@ -50,6 +50,6 @@ class TestSession(utils.TestCase):
     BASE_URL = 'https://api.example.com:1234/test'
 
     def setUp(self):
-        super(TestSession, self).setUp()
+        super().setUp()
         self.sess = session.Session()
         self.requests_mock = self.useFixture(fixture.Fixture())

osc_lib/tests/api/test_api.py

@@ -23,7 +23,7 @@ from osc_lib.tests.api import fakes as api_fakes
 
 class TestBaseAPIDefault(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPIDefault, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI()
 
     def test_baseapi_request_no_url(self):
@@ -186,7 +186,7 @@ class TestBaseAPIEndpointArg(api_fakes.TestSession):
 
 class TestBaseAPIArgs(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPIArgs, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,
@@ -220,7 +220,7 @@ class TestBaseAPIArgs(api_fakes.TestSession):
 
 class TestBaseAPICreate(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPICreate, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,
@@ -258,7 +258,7 @@ class TestBaseAPICreate(api_fakes.TestSession):
 
 class TestBaseAPIFind(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPIFind, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,
@@ -452,7 +452,7 @@ class TestBaseAPIFind(api_fakes.TestSession):
 
 class TestBaseAPIList(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPIList, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,

osc_lib/tests/api/test_utils.py

@@ -24,7 +24,7 @@ class TestBaseAPIFilter(api_fakes.TestSession):
     """The filters can be tested independently"""
 
     def setUp(self):
-        super(TestBaseAPIFilter, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,

osc_lib/tests/cli/test_client_config.py

@@ -17,7 +17,7 @@ from osc_lib.tests import utils
 
 class TestOSCConfig(utils.TestCase):
     def setUp(self):
-        super(TestOSCConfig, self).setUp()
+        super().setUp()
 
         self.cloud = client_config.OSC_Config()
 

osc_lib/tests/cli/test_format_columns.py

@@ -104,7 +104,7 @@ class TestListDictColumn(utils.TestCase):
         # OrderedDict is a subclass of dict and would inadvertently pass
         self.assertEqual(type(col.machine_readable()), list)  # noqa: H212
         for x in col.machine_readable():
-            self.assertEqual(type(x), dict)  # noqa: H212
+            self.assertEqual(type(x), dict)  # noqa: H211
 
 
 class TestSizeColumn(utils.TestCase):

osc_lib/tests/cli/test_parseractions.py

@@ -21,7 +21,7 @@ from osc_lib.tests import utils
 
 class TestKeyValueAction(utils.TestCase):
     def setUp(self):
-        super(TestKeyValueAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -68,14 +68,12 @@ class TestKeyValueAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
 
 class TestKeyValueAppendAction(utils.TestCase):
     def setUp(self):
-        super(TestKeyValueAppendAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -129,14 +127,12 @@ class TestKeyValueAppendAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
 
 class TestMultiKeyValueAction(utils.TestCase):
     def setUp(self):
-        super(TestMultiKeyValueAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -213,13 +209,11 @@ class TestMultiKeyValueAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
     def test_error_values_without_comma(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -229,7 +223,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
     def test_missing_key(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -239,7 +233,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
     def test_invalid_key(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -278,7 +272,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
 class TestMultiKeyValueCommaAction(utils.TestCase):
     def setUp(self):
-        super(TestMultiKeyValueCommaAction, self).setUp()
+        super().setUp()
         self.parser = argparse.ArgumentParser()
 
         # Typical usage
@@ -361,21 +355,16 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         ]
         self.assertCountEqual(expect, actual)
 
-        try:
-            results = self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,bbb',
-                    '--test',
-                    'opt2=ccc',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                'Missing required keys req1.\nRequired keys are: req1',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            [
+                '--test',
+                'req1=aaa,bbb',
+                '--test',
+                'opt2=ccc',
+            ],
+        )
 
     def test_mkvca_multiples(self):
         results = self.parser.parse_args(
@@ -431,75 +420,34 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         self.assertCountEqual(expect, actual)
 
     def test_mkvca_invalid_key(self):
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,bbb=',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'Invalid keys bbb specified.\nValid keys are:',
-                str(e),
-            )
-
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'nnn=aaa',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'Invalid keys nnn specified.\nValid keys are:',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'req1=aaa,bbb='],
+        )
+
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'nnn=aaa'],
+        )
 
     def test_mkvca_value_no_key(self):
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,=bbb',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                "A key must be specified before '=': =bbb",
-                str(e),
-            )
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    '=nnn',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                "A key must be specified before '=': =nnn",
-                str(e),
-            )
-
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'nnn',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'A key=value pair is required:',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'req1=aaa,=bbb'],
+        )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', '=nnn'],
+        )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'nnn'],
+        )
 
     def test_mkvca_required_keys_not_list(self):
         self.assertRaises(
@@ -532,7 +480,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
 
 class TestNonNegativeAction(utils.TestCase):
     def setUp(self):
-        super(TestNonNegativeAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -546,7 +494,7 @@ class TestNonNegativeAction(utils.TestCase):
 
     def test_negative_values(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             "--foo -1".split(),
         )

osc_lib/tests/command/test_timing.py

@@ -27,7 +27,7 @@ timing_url = 'http://localhost:5000'
 timing_elapsed = 0.872809
 
 
-class FakeGenericClient(object):
+class FakeGenericClient:
     def __init__(self, **kwargs):
         self.auth_token = kwargs['token']
         self.management_url = kwargs['endpoint']
@@ -40,7 +40,7 @@ class TestTiming(utils.TestCommand):
     )
 
     def setUp(self):
-        super(TestTiming, self).setUp()
+        super().setUp()
 
         self.app.timing_data = []
 

osc_lib/tests/fakes.py

@@ -60,12 +60,12 @@ def to_unicode_dict(catalog_dict):
     elif isinstance(catalog_dict, list):
         return [to_unicode_dict(element) for element in catalog_dict]
     elif isinstance(catalog_dict, str):
-        return catalog_dict + u""
+        return catalog_dict + ""
     else:
         return catalog_dict
 
 
-class FakeStdout(object):
+class FakeStdout:
     def __init__(self):
         self.content = []
 
@@ -79,7 +79,7 @@ class FakeStdout(object):
         return result
 
 
-class FakeLog(object):
+class FakeLog:
     def __init__(self):
         self.messages = {}
 
@@ -99,7 +99,7 @@ class FakeLog(object):
         self.messages['critical'] = msg
 
 
-class FakeApp(object):
+class FakeApp:
     def __init__(self, _stdout, _log):
         self.stdout = _stdout
         self.client_manager = None
@@ -110,12 +110,12 @@ class FakeApp(object):
         self.log = _log
 
 
-class FakeOptions(object):
+class FakeOptions:
     def __init__(self, **kwargs):
         self.os_beta_command = False
 
 
-class FakeClientManager(object):
+class FakeClientManager:
     def __init__(self):
         self.compute = None
         self.identity = None
@@ -139,7 +139,7 @@ class FakeClientManager(object):
         }
 
 
-class FakeModule(object):
+class FakeModule:
     def __init__(self, name, version):
         self.name = name
         self.__version__ = version
@@ -148,7 +148,7 @@ class FakeModule(object):
         self.version.__version__ = version
 
 
-class FakeResource(object):
+class FakeResource:
     def __init__(self, manager=None, info=None, loaded=False, methods=None):
         """Set attributes and methods for a resource.
 
@@ -191,8 +191,8 @@ class FakeResource(object):
         reprkeys = sorted(
             k for k in self.__dict__.keys() if k[0] != '_' and k != 'manager'
         )
-        info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys)
-        return "<%s %s>" % (self.__class__.__name__, info)
+        info = ", ".join(f"{k}={getattr(self, k)}" for k in reprkeys)
+        return f"<{self.__class__.__name__} {info}>"
 
     def keys(self):
         return self._info.keys()

osc_lib/tests/test_clientmanager.py

@@ -49,7 +49,7 @@ AUTH_DICT = {
 auth.get_options_list()
 
 
-class Container(object):
+class Container:
     attr = clientmanager.ClientCache(lambda x: object())
     buggy_attr = clientmanager.ClientCache(lambda x: x.foo)
 

osc_lib/tests/test_logs.py

@@ -76,7 +76,7 @@ class TestFileFormatter(utils.TestCase):
         )
 
     def test_options(self):
-        class Opts(object):
+        class Opts:
             cloud = 'cloudy'
             os_project_name = 'projecty'
             username = 'usernamey'
@@ -107,7 +107,7 @@ class TestFileFormatter(utils.TestCase):
 
 class TestLogConfigurator(utils.TestCase):
     def setUp(self):
-        super(TestLogConfigurator, self).setUp()
+        super().setUp()
         self.options = mock.Mock()
         self.options.verbose_level = 1
         self.options.log_file = None

osc_lib/tests/test_shell.py

@@ -123,7 +123,7 @@ class TestShellArgV(utils.TestShell):
     """Test the deferred help flag"""
 
     def setUp(self):
-        super(TestShellArgV, self).setUp()
+        super().setUp()
 
     def test_shell_argv(self):
         """Test argv decoding
@@ -148,14 +148,14 @@ class TestShellArgV(utils.TestShell):
 
             # When shell.main() gets sys.argv itself it should be decoded
             shell.main()
-            self.assertEqual(type(u'x'), type(self.app.call_args[0][0][0]))
+            self.assertEqual(str, type(self.app.call_args[0][0][0]))
 
 
 class TestShellHelp(utils.TestShell):
     """Test the deferred help flag"""
 
     def setUp(self):
-        super(TestShellHelp, self).setUp()
+        super().setUp()
         self.useFixture(utils.EnvFixture())
 
     @testtools.skip("skip until bug 1444983 is resolved")
@@ -182,7 +182,7 @@ class TestShellOptions(utils.TestShell):
     """
 
     def setUp(self):
-        super(TestShellOptions, self).setUp()
+        super().setUp()
         self.useFixture(utils.EnvFixture())
 
     def test_empty_auth(self):
@@ -213,7 +213,7 @@ class TestShellCli(utils.TestShell):
     """
 
     def setUp(self):
-        super(TestShellCli, self).setUp()
+        super().setUp()
         env = {}
         self.useFixture(utils.EnvFixture(env.copy()))
 
@@ -465,7 +465,7 @@ class TestShellCliPrecedence(utils.TestShell):
     """Test option precedencr order"""
 
     def setUp(self):
-        super(TestShellCliPrecedence, self).setUp()
+        super().setUp()
         env = {
             'OS_CLOUD': 'megacloud',
             'OS_REGION_NAME': 'occ-env',

osc_lib/tests/utils/__init__.py

@@ -108,7 +108,7 @@ class TestCase(testtools.TestCase):
 
         if m.called:
             if not msg:
-                msg = 'method %s should not have been called' % m
+                msg = f'method {m} should not have been called'
             self.fail(msg)
 
     @contextlib.contextmanager
@@ -120,7 +120,7 @@ class TestCase(testtools.TestCase):
          * bug in testtools that breaks support for all versions
         """
         try:
-            with super(TestCase, self).subTest(*args, **kwargs):
+            with super().subTest(*args, **kwargs):
                 yield
         except TypeError:
             raise
@@ -134,7 +134,7 @@ class TestCommand(TestCase):
     """Test cliff command classes"""
 
     def setUp(self):
-        super(TestCommand, self).setUp()
+        super().setUp()
         # Build up a fake app
         self.fake_stdout = fakes.FakeStdout()
         self.fake_log = fakes.FakeLog()
@@ -201,7 +201,7 @@ class TestClientManager(TestCase):
     }
 
     def setUp(self):
-        super(TestClientManager, self).setUp()
+        super().setUp()
         self.mock = mock.Mock()
         self.requests = self.useFixture(fixture.Fixture())
         # fake v2password token retrieval
@@ -319,7 +319,7 @@ class TestShell(TestCase):
     shell_class_name = "osc_lib.shell.OpenStackShell"
 
     def setUp(self):
-        super(TestShell, self).setUp()
+        super().setUp()
         self.shell_class = importutils.import_class(self.shell_class_name)
         self.cmd_patch = mock.patch(self.shell_class_name + ".run_subcommand")
         self.cmd_save = self.cmd_patch.start()
@@ -349,7 +349,7 @@ class TestShell(TestCase):
                 self.assertEqual(
                     default_args[k],
                     vars(_shell.options)[k],
-                    "%s does not match" % k,
+                    f"{k} does not match",
                 )
 
     def _assert_cloud_region_arg(self, cmd_options, default_args):
@@ -377,7 +377,7 @@ class TestShell(TestCase):
                 self.assertEqual(
                     default_args[k],
                     vars(opts)[k],
-                    "%s does not match" % k,
+                    f"{k} does not match",
                 )
 
     def _test_options_init_app(self, test_opts):

osc_lib/tests/utils/test_utils.py

@@ -368,7 +368,7 @@ class TestUtils(test_utils.TestCase):
         self.assertFalse(utils.is_ascii(b'\xe2'))
 
     def test_is_ascii_string(self):
-        self.assertFalse(utils.is_ascii(u'\u2665'))
+        self.assertFalse(utils.is_ascii('\u2665'))
 
     def test_format_size(self):
         self.assertEqual("999", utils.format_size(999))
@@ -544,7 +544,7 @@ class NoUniqueMatch(Exception):
 
 class TestFindResource(test_utils.TestCase):
     def setUp(self):
-        super(TestFindResource, self).setUp()
+        super().setUp()
         self.name = 'legos'
         self.expected = mock.Mock()
         self.manager = mock.Mock()
@@ -920,7 +920,7 @@ class TestAssertItemEqual(test_utils.TestCommand):
 
 class TestSDKUtils(test_utils.TestCase):
     def setUp(self):
-        super(TestSDKUtils, self).setUp()
+        super().setUp()
 
     def _test_get_osc_show_columns_for_sdk_resource(
         self,

osc_lib/utils/__init__.py

@@ -345,7 +345,7 @@ def format_dict_of_list(data, separator='; '):
         if value is None:
             continue
         value_str = format_list(value)
-        group = "%s=%s" % (key, value_str)
+        group = f"{key}={value_str}"
         output.append(group)
 
     return separator.join(output)
@@ -400,10 +400,10 @@ def format_size(size):
         index = index + 1
         size = size / base
 
-    padded = '%.1f' % size
+    padded = f'{size:.1f}'
     stripped = padded.rstrip('0').rstrip('.')
 
-    return '%s%s' % (stripped, suffix[index])
+    return f'{stripped}{suffix[index]}'
 
 
 def get_client_class(api_name, version, version_map):
@@ -596,7 +596,7 @@ def read_blob_file_contents(blob_file):
         with open(blob_file) as file:
             blob = file.read().strip()
         return blob
-    except IOError:
+    except OSError:
         msg = _("Error occurred trying to read from file %s")
         raise exceptions.CommandError(msg % blob_file)
 

osc_lib/utils/columns.py

@@ -29,9 +29,11 @@ def get_column_definitions(attr_map, long_listing):
 
         .. code-block:: python
 
-           (('id', 'ID', LIST_BOTH),
-            ('name', 'Name', LIST_BOTH),
-            ('tenant_id', 'Project', LIST_LONG_ONLY))
+           (
+               ('id', 'ID', LIST_BOTH),
+               ('name', 'Name', LIST_BOTH),
+               ('tenant_id', 'Project', LIST_LONG_ONLY),
+           )
 
         The third field of each tuple must be one of LIST_BOTH,
         LIST_LONG_ONLY (a corresponding column is shown only in a long mode),
@@ -80,17 +82,18 @@ def get_columns(item, attr_map=None):
 
         .. code-block:: python
 
-           {'id': 'myid', 'name': 'myname',
-            'foo': 'bar', 'tenant_id': 'mytenan'}
+           {'id': 'myid', 'name': 'myname', 'foo': 'bar', 'tenant_id': 'mytenan'}
 
     :param attr_map: a list of mapping from attribute to display name.
         The same format is used as for get_column_definitions attr_map.
 
         .. code-block:: python
 
-           (('id', 'ID', LIST_BOTH),
-            ('name', 'Name', LIST_BOTH),
-            ('tenant_id', 'Project', LIST_LONG_ONLY))
+           (
+               ('id', 'ID', LIST_BOTH),
+               ('name', 'Name', LIST_BOTH),
+               ('tenant_id', 'Project', LIST_LONG_ONLY),
+           )
 
     :return: A pair of tuple of attributes and tuple of display names.
 

{osc_lib-3.0.1.dist-info → osc_lib-3.2.0.dist-info}/AUTHORS

@@ -107,6 +107,7 @@ OpenStack Release Bot <infra-root@openstack.org>
 Paul Belanger <paul.belanger@polybeacon.com>
 Qiu Yu <qiuyu@ebaysf.com>
 Rabi Mishra <ramishra@redhat.com>
+Radoslaw Smigielski <rsmigiel@redhat.com>
 Reedip <reedip14@gmail.com>
 Riccardo Pittau <elfosardo@gmail.com>
 Richard Theis <rtheis@us.ibm.com>
@@ -123,6 +124,7 @@ Stephen Finucane <stephenfin@redhat.com>
 Steve Martinelli <s.martinelli@gmail.com>
 Steve Martinelli <stevemar@ca.ibm.com>
 Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>
 Tang Chen <chen.tang@easystack.cn>
 Tang Chen <tangchen@cn.fujitsu.com>

{osc_lib-3.0.1.dist-info → osc_lib-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osc-lib
-Version: 3.0.1
+Version: 3.2.0
 Summary: OpenStackClient Library
 Home-page: https://docs.openstack.org/osc-lib/latest/
 Author: OpenStack
@@ -26,7 +26,7 @@ Requires-Dist: openstacksdk (>=0.15.0)
 Requires-Dist: oslo.i18n (>=3.15.3)
 Requires-Dist: oslo.utils (>=3.33.0)
 Requires-Dist: pbr (!=2.1.0,>=2.0.0)
-Requires-Dist: simplejson (>=3.5.1)
+Requires-Dist: requests (>=2.14.2)
 Requires-Dist: stevedore (>=1.20.0)
 
 =======

osc_lib-3.2.0.dist-info/RECORD

@@ -0,0 +1,51 @@
+osc_lib/__init__.py,sha256=2NlShJ0jsku4xvwHtwbX_7-stc3huuMyfzohJcBZPGQ,673
+osc_lib/clientmanager.py,sha256=zbTboCTVgeySRT5HaZOwt263bMAg3f33jBQIP5RH7aU,9812
+osc_lib/exceptions.py,sha256=QfwLbvwyMNvQV63ZKdaTCLZrFhARoLBFG_Wyyf-9CY8,3439
+osc_lib/i18n.py,sha256=Be2g7dxbMzzryhCecbgiAw5lHtfSQwVbAO8kC9dGvWo,783
+osc_lib/logs.py,sha256=JamCFbUSqFGcbVXfxEyJQOPPvpGnlPjhSX0kpIE-U40,7119
+osc_lib/shell.py,sha256=xRyEJmIo5IdVVF2AztRojNXnrSM_U7PZ7MTHhue4fKg,19050
+osc_lib/version.py,sha256=Csam3SVWQ7sUSXbOOBIPyv9DAHv_EfMIPpExsXYMVX0,710
+osc_lib/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/api/api.py,sha256=Kleyt_9F_7-_l2UsTCtwl4yDXI7u4qG75u0QU9YFBa4,12526
+osc_lib/api/auth.py,sha256=u-gic_JCqF3nNbRV2mTWz9Vdybf2_48DfkbvkCIFQz4,8150
+osc_lib/api/utils.py,sha256=JDpM-vQUeEL_vYBYfj-WVM_mAhxA6KDmnTTYU9TleYY,3159
+osc_lib/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/cli/client_config.py,sha256=OqnwNm6ehFtjuxKYpYy4HFSs-bjP3inq2yGUxoheGU8,9510
+osc_lib/cli/format_columns.py,sha256=loM4At-VhjR6rMNYO4w5RnuoGGr9zq5LsPC_3UaYXSY,1918
+osc_lib/cli/identity.py,sha256=TIJDIEFJLKKE_HrFePxkelkev6DHuVrwo8DpJgivFs0,2711
+osc_lib/cli/parseractions.py,sha256=Dj-7bHFzhxOS0DkFtr0ocafFDhE7aSpPmn2gxtMmXYs,10682
+osc_lib/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/command/command.py,sha256=nmr6MEWXQxWzbSBuCz-VMQFh9giz6tHOlJ1bzxbFeQY,1967
+osc_lib/command/commandmanager.py,sha256=s9lWu5lMKqrzasUDcK-KfJRpPCTHbC7ZYnd3Fztk_pg,761
+osc_lib/command/timing.py,sha256=TGRfuhkYp-eFO-CqeEDRe_km4OiqzaybXWOPehXLoUg,1139
+osc_lib/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/tests/fakes.py,sha256=i08gNu-qPtYIb5Gmk3vpDrq2RCxytOeyW0NHkhUXeZg,5720
+osc_lib/tests/test_clientmanager.py,sha256=_pMlhjtxkIU5pWocs_CH8-iRaA0nkskLC6aWlNPLahs,15577
+osc_lib/tests/test_logs.py,sha256=iZX3WqkNZCooe4U6j5dWVwJ4gfgMcTUGxPFnmUvBhzs,8797
+osc_lib/tests/test_shell.py,sha256=PZqMq_tIP5rHMKm7MPoU78dOu8f6W5BfQa8jBAz4x50,20106
+osc_lib/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/tests/api/fakes.py,sha256=gz5ioOnBzh32Vbka6RSfAvC8OYnF0fxliNYENwUOPvg,1342
+osc_lib/tests/api/test_api.py,sha256=hIomMc-aoWK7sTWFNARd-o3qMX4kfpRx3h-9T5zOZaE,16572
+osc_lib/tests/api/test_utils.py,sha256=RSO4M8vD0GJXlxglXKgyZxHGeRqKgU8uzdQqiUMMVGI,3351
+osc_lib/tests/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/tests/cli/test_client_config.py,sha256=vT-CGfEcYrfQuMKs4Nvk4fjCOKJY1vYXooip0r3UaWs,8464
+osc_lib/tests/cli/test_format_columns.py,sha256=RAybYwa8ow4XjsSGjP8-T1D5pJ7bM89giLrRAJG3fps,4391
+osc_lib/tests/cli/test_identity.py,sha256=-jJ4p0R4dCkgAJffOhjRcpB2qMa7OE10efbflA0B2ss,3375
+osc_lib/tests/cli/test_parseractions.py,sha256=qeDIKPD0OEbEnLFgdOMSDrHOLLrMMFf2Z7j5wPMDyZA,13749
+osc_lib/tests/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osc_lib/tests/command/test_command.py,sha256=nCf51tbJOFQ4sQEOuaWJG4UkXmexfPED5zYzoTJ1WyI,1682
+osc_lib/tests/command/test_timing.py,sha256=UtrhOMVxE4qg9x0PIXI-ExPqvAfZCZgTallMJZn0ZUo,3058
+osc_lib/tests/utils/__init__.py,sha256=NTiJa_drt74jCReAbM9NtxaZh28rwlpHmq45gEcx4xA,14475
+osc_lib/tests/utils/test_columns.py,sha256=OkVy-Soy899JHpNNiGZOVDsQibjwaz47lAz9bO7_9Ro,2445
+osc_lib/tests/utils/test_tags.py,sha256=TlD14ggSzYLEEC4ZbFTdRckz6b8M5-3MAwV0lHU12vI,11745
+osc_lib/tests/utils/test_utils.py,sha256=OpqrADPVDVlg8fr5hBbXmERZsvJMUBHKa0yJi3n_YPE,35425
+osc_lib/utils/__init__.py,sha256=ZGcDIABzYFcnafwtHW1XYI27GwHNxsjjXriqoP0xDdc,27973
+osc_lib/utils/columns.py,sha256=RWDddoXe4ghHMPkADZ3lBq3SLUgTM9zhRQh6iLBfq0c,4021
+osc_lib/utils/tags.py,sha256=-OTKm4Bhv6GZAzO-yTOXP10uiYurN1sK3Rf1yb07r0M,7971
+osc_lib-3.2.0.dist-info/AUTHORS,sha256=Z102Ulbz9vDvTh_HYZN1q0OLzLKgKe4nmiDYGkfl_Ac,6604
+osc_lib-3.2.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+osc_lib-3.2.0.dist-info/METADATA,sha256=NeZxccGhpf6ec4c5nBFCH3JeEhbwvxdXAeCQM9Waqj8,3602
+osc_lib-3.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+osc_lib-3.2.0.dist-info/pbr.json,sha256=e8kmAgOjG9-8ysIxfXKbp77TH7gBHvGa3IZxZb8OAl8,46
+osc_lib-3.2.0.dist-info/top_level.txt,sha256=2gBTdue3DjRADXu0aOKF83SmJiKaCwfZ9z6hzCrjYr4,8
+osc_lib-3.2.0.dist-info/RECORD,,

osc_lib-3.2.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "d3fdae8", "is_release": true}

osc_lib-3.0.1.dist-info/RECORD

@@ -1,51 +0,0 @@
-osc_lib/__init__.py,sha256=2NlShJ0jsku4xvwHtwbX_7-stc3huuMyfzohJcBZPGQ,673
-osc_lib/clientmanager.py,sha256=fijs7Piy2DL-YSJcx47af8pAKKjfQD84uN6COQfo0_Q,9821
-osc_lib/exceptions.py,sha256=GjjAibV3OaMpgJPEGwIpni3sejkId-7usWPSJ34KWwM,3445
-osc_lib/i18n.py,sha256=Be2g7dxbMzzryhCecbgiAw5lHtfSQwVbAO8kC9dGvWo,783
-osc_lib/logs.py,sha256=fE2tCRrFps-YMnnu8vzxijcdLniYY-7_K1Z94kKDu9A,7127
-osc_lib/shell.py,sha256=DWKuPDVpEpruiawF0lhEsZ-dykQgCMPgiIrd3O0-zTY,19223
-osc_lib/version.py,sha256=Csam3SVWQ7sUSXbOOBIPyv9DAHv_EfMIPpExsXYMVX0,710
-osc_lib/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/api/api.py,sha256=boBrpyKAKiKjt87EnnM3JYX8J03q6JLFlkekxUSoFbc,12554
-osc_lib/api/auth.py,sha256=DeFE5zOSAIdai6iDdf1nk9gijEX2Uc0PBVmGnwB7eJU,8177
-osc_lib/api/utils.py,sha256=JDpM-vQUeEL_vYBYfj-WVM_mAhxA6KDmnTTYU9TleYY,3159
-osc_lib/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/cli/client_config.py,sha256=68cAyPRpfgAE-nK-hus2hqfmYBJYh2TU0Kprve5M3w4,9466
-osc_lib/cli/format_columns.py,sha256=loM4At-VhjR6rMNYO4w5RnuoGGr9zq5LsPC_3UaYXSY,1918
-osc_lib/cli/identity.py,sha256=TIJDIEFJLKKE_HrFePxkelkev6DHuVrwo8DpJgivFs0,2711
-osc_lib/cli/parseractions.py,sha256=5sKKNMULzPvEr4ld-jd-dRHKSGPNUPDmfc6aAdg4Mo8,10678
-osc_lib/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/command/command.py,sha256=4Xyzl9Gj3iJ3ip2spAqSMO_-qy7GP7bILGrTlzBHiFM,1996
-osc_lib/command/commandmanager.py,sha256=s9lWu5lMKqrzasUDcK-KfJRpPCTHbC7ZYnd3Fztk_pg,761
-osc_lib/command/timing.py,sha256=TGRfuhkYp-eFO-CqeEDRe_km4OiqzaybXWOPehXLoUg,1139
-osc_lib/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/tests/fakes.py,sha256=EScOc1lorFXBaReUqph7gtO60HqZDNXoPoZtcpu1YOs,5789
-osc_lib/tests/test_clientmanager.py,sha256=fepY1Xj_pC_IwxS03bKDTrOS6DHylUAgpgtA1ZuXy3I,15585
-osc_lib/tests/test_logs.py,sha256=oXFuKQfTB5Ul4graar7o3_qTpFXHKA_C0VUPlb0sSuE,8830
-osc_lib/tests/test_shell.py,sha256=c45YSErHzdjhdDlh64inIJGckSNKPgIwhivb33frsEc,20219
-osc_lib/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/tests/api/fakes.py,sha256=Kcw_qtegRlpkQ0fRXhUSx-HtfbEwDJcRrZLc8WAraMg,1359
-osc_lib/tests/api/test_api.py,sha256=uWXgHtcEmN3UB--SGd72I8YSv_0cJbPursv_oGtog5A,16682
-osc_lib/tests/api/test_utils.py,sha256=ypMP8kBSOdIXHFprtl-Kqddn4vSQNr61OLSqziEvMFQ,3374
-osc_lib/tests/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/tests/cli/test_client_config.py,sha256=r5IFa-hhU0-2s_D7k6izmcas0-l5nWkRBB8oCmPsvLw,8483
-osc_lib/tests/cli/test_format_columns.py,sha256=YZZEE7XMe8uGcJldpqnmILUQMAGMgVXOianx3rCzIwk,4391
-osc_lib/tests/cli/test_identity.py,sha256=-jJ4p0R4dCkgAJffOhjRcpB2qMa7OE10efbflA0B2ss,3375
-osc_lib/tests/cli/test_parseractions.py,sha256=BazA--mBz0RQxQ-uYWOsQSHyZ2JAf974eYUj3fEbnx4,15651
-osc_lib/tests/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osc_lib/tests/command/test_command.py,sha256=nCf51tbJOFQ4sQEOuaWJG4UkXmexfPED5zYzoTJ1WyI,1682
-osc_lib/tests/command/test_timing.py,sha256=G6gLiY0nnnxF4sqPQ5HozRIvFe1Jb2H7mr0O8vTkvaQ,3082
-osc_lib/tests/utils/__init__.py,sha256=oDZmA7JJOkBcuy3fWnkb2VqAuN5GD_H4pzrriDoh6W4,14550
-osc_lib/tests/utils/test_columns.py,sha256=OkVy-Soy899JHpNNiGZOVDsQibjwaz47lAz9bO7_9Ro,2445
-osc_lib/tests/utils/test_tags.py,sha256=TlD14ggSzYLEEC4ZbFTdRckz6b8M5-3MAwV0lHU12vI,11745
-osc_lib/tests/utils/test_utils.py,sha256=GvnsRhilCNLzoSH1a1EQr4FxU7JAm_NcQuan70tOVo0,35466
-osc_lib/utils/__init__.py,sha256=tI8GVdOZcMU0I-08Y0awYW7sMzOykw2ja-l9RFrPeKc,27985
-osc_lib/utils/columns.py,sha256=Qt4wC9biUEJQ14PUi97odzSztIBY1ZOWD0YfYVmVDFY,3963
-osc_lib/utils/tags.py,sha256=-OTKm4Bhv6GZAzO-yTOXP10uiYurN1sK3Rf1yb07r0M,7971
-osc_lib-3.0.1.dist-info/AUTHORS,sha256=vo7hWhmcT_06HhgzRDcHrbk5DMqb2Cq2k7wEGIpghG4,6517
-osc_lib-3.0.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-osc_lib-3.0.1.dist-info/METADATA,sha256=_El8XTQLSfzeg3PLhE3vbyuonr2Caj_XOWgEhckN1Z0,3603
-osc_lib-3.0.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-osc_lib-3.0.1.dist-info/pbr.json,sha256=PZSReK1M89MKVjTZr-BnJ8KiJUUg88CAMSIlJkgH6pA,46
-osc_lib-3.0.1.dist-info/top_level.txt,sha256=2gBTdue3DjRADXu0aOKF83SmJiKaCwfZ9z6hzCrjYr4,8
-osc_lib-3.0.1.dist-info/RECORD,,

osc_lib-3.0.1.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "73ecaa7", "is_release": true}