osc-lib 4.0.0__tar.gz → 4.0.1__tar.gz

{osc_lib-4.0.0 → osc_lib-4.0.1}/ChangeLog

@@ -1,6 +1,15 @@
 CHANGES
 =======
 
+4.0.1
+-----
+
+* Temporarily revert dependency bumps
+* Use Python 3.8-style type hints
+* Temporarily undrop support for Python 3.8, 3.9
+* Drop support for Python 3.8, 3.9
+* Replace UPPER\_CONSTRAINTS\_FILE
+
 4.0.0
 -----
 

{osc_lib-4.0.0 → osc_lib-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osc-lib
-Version: 4.0.0
+Version: 4.0.1
 Summary: OpenStackClient Library
 Home-page: https://docs.openstack.org/osc-lib/latest/
 Author: OpenStack
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: cliff>=4.9.0
-Requires-Dist: keystoneauth1>=5.10.0
+Requires-Dist: cliff>=3.2.0
+Requires-Dist: keystoneauth1>=3.14.0
 Requires-Dist: openstacksdk>=0.15.0
 Requires-Dist: oslo.i18n>=3.15.3
 Requires-Dist: oslo.utils>=3.33.0

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/api/api.py

@@ -13,7 +13,6 @@
 
 """Base API Library"""
 
-import builtins
 import typing as ty
 import warnings
 
@@ -204,7 +203,7 @@ class BaseAPI:
         session: ty.Optional[ksa_session.Session] = None,
         body: ty.Any = None,
         detailed: bool = False,
-        headers: ty.Optional[dict[str, str]] = None,
+        headers: ty.Optional[ty.Dict[str, str]] = None,
         **params: ty.Any,
     ) -> ty.Union[requests.Response, ty.Any]:
         """Return a list of resources
@@ -291,7 +290,7 @@ class BaseAPI:
         if resource is None:
             resource = path
 
-        def getlist(kw: dict[str, ty.Any]) -> ty.Any:
+        def getlist(kw: ty.Dict[str, ty.Any]) -> ty.Any:
             """Do list call, unwrap resource dict if present"""
             ret = self.list(path, **kw)
             if isinstance(ret, dict) and resource in ret:
@@ -324,9 +323,9 @@ class BaseAPI:
     def find_bulk(
         self,
         path: str,
-        headers: ty.Optional[dict[str, str]] = None,
+        headers: ty.Optional[ty.Dict[str, str]] = None,
         **kwargs: ty.Any,
-    ) -> builtins.list[ty.Any]:
+    ) -> ty.List[ty.Any]:
         """Bulk load and filter locally
 
         :param string path:
@@ -378,7 +377,7 @@ class BaseAPI:
         path: str,
         value: ty.Optional[str] = None,
         attr: ty.Optional[str] = None,
-        headers: ty.Optional[dict[str, str]] = None,
+        headers: ty.Optional[ty.Dict[str, str]] = None,
     ) -> ty.Any:
         """Find a single resource by name or ID
 

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/api/auth.py

@@ -39,10 +39,10 @@ class _OptionDict(ty.TypedDict):
 
 
 # List of plugin command line options
-OPTIONS_LIST: dict[str, _OptionDict] = {}
+OPTIONS_LIST: ty.Dict[str, _OptionDict] = {}
 
 
-def get_plugin_list() -> frozenset[str]:
+def get_plugin_list() -> ty.FrozenSet[str]:
     """Gather plugin list and cache it"""
 
     global PLUGIN_LIST
@@ -52,7 +52,7 @@ def get_plugin_list() -> frozenset[str]:
     return PLUGIN_LIST
 
 
-def get_options_list() -> dict[str, _OptionDict]:
+def get_options_list() -> ty.Dict[str, _OptionDict]:
     """Gather plugin options so the help action has them available"""
 
     global OPTIONS_LIST

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/api/utils.py

@@ -16,7 +16,7 @@
 import typing as ty
 
 
-_T = ty.TypeVar('_T', bound=list[ty.Any])
+_T = ty.TypeVar('_T', bound=ty.List[ty.Any])
 
 
 def simple_filter(

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/cli/client_config.py

@@ -29,8 +29,8 @@ LOG = logging.getLogger(__name__)
 # before auth plugins are loaded
 class OSC_Config(config.OpenStackConfig):  # type: ignore
     def _auth_select_default_plugin(
-        self, config: dict[str, ty.Any]
-    ) -> dict[str, ty.Any]:
+        self, config: ty.Dict[str, ty.Any]
+    ) -> ty.Dict[str, ty.Any]:
         """Select a default plugin based on supplied arguments
 
         Migrated from auth.select_auth_plugin()
@@ -64,8 +64,8 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
         return config
 
     def _auth_v2_arguments(
-        self, config: dict[str, ty.Any]
-    ) -> dict[str, ty.Any]:
+        self, config: ty.Dict[str, ty.Any]
+    ) -> ty.Dict[str, ty.Any]:
         """Set up v2-required arguments from v3 info
 
         Migrated from auth.build_auth_params()
@@ -79,8 +79,8 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
         return config
 
     def _auth_v2_ignore_v3(
-        self, config: dict[str, ty.Any]
-    ) -> dict[str, ty.Any]:
+        self, config: ty.Dict[str, ty.Any]
+    ) -> ty.Dict[str, ty.Any]:
         """Remove v3 arguments if present for v2 plugin
 
         Migrated from clientmanager.setup_auth()
@@ -119,8 +119,8 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
         return config
 
     def _auth_default_domain(
-        self, config: dict[str, ty.Any]
-    ) -> dict[str, ty.Any]:
+        self, config: ty.Dict[str, ty.Any]
+    ) -> ty.Dict[str, ty.Any]:
         """Set a default domain from available arguments
 
         Migrated from clientmanager.setup_auth()
@@ -161,7 +161,9 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
                 config['auth']['user_domain_id'] = default_domain
         return config
 
-    def auth_config_hook(self, config: dict[str, ty.Any]) -> dict[str, ty.Any]:
+    def auth_config_hook(
+        self, config: ty.Dict[str, ty.Any]
+    ) -> ty.Dict[str, ty.Any]:
         """Allow examination of config values before loading auth plugin
 
         OpenStackClient will override this to perform additional checks
@@ -181,9 +183,9 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
 
     def _validate_auth(
         self,
-        config: dict[str, ty.Any],
-        loader: ksa_loading.BaseIdentityLoader[ty.Any],
-    ) -> dict[str, ty.Any]:
+        config: ty.Dict[str, ty.Any],
+        loader: ksa_loading.BaseIdentityLoader,  # type: ignore
+    ) -> ty.Dict[str, ty.Any]:
         """Validate auth plugin arguments"""
         # May throw a keystoneauth1.exceptions.NoMatchingPlugin
 
@@ -248,7 +250,7 @@ class OSC_Config(config.OpenStackConfig):  # type: ignore
         return config
 
     # TODO(stephenfin): Add type once we have typing for SDK
-    def load_auth_plugin(self, config: dict[str, ty.Any]) -> ty.Any:
+    def load_auth_plugin(self, config: ty.Dict[str, ty.Any]) -> ty.Any:
         """Get auth plugin and validate args"""
 
         loader = self._get_auth_loader(config)

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/cli/format_columns.py

@@ -22,47 +22,47 @@ from cliff import columns
 from osc_lib import utils
 
 
-class DictColumn(columns.FormattableColumn[dict[str, ty.Any]]):
+class DictColumn(columns.FormattableColumn):  # type: ignore
     """Format column for dict content"""
 
     def human_readable(self) -> str:
         return utils.format_dict(self._value)
 
-    def machine_readable(self) -> dict[str, ty.Any]:
+    def machine_readable(self) -> ty.Dict[str, ty.Any]:
         return dict(self._value or {})
 
 
-class DictListColumn(columns.FormattableColumn[dict[str, list[ty.Any]]]):
+class DictListColumn(columns.FormattableColumn):  # type: ignore
     """Format column for dict, key is string, value is list"""
 
     def human_readable(self) -> str:
         return utils.format_dict_of_list(self._value) or ''
 
-    def machine_readable(self) -> dict[str, list[ty.Any]]:
+    def machine_readable(self) -> ty.Dict[str, ty.List[ty.Any]]:
         return dict(self._value or {})
 
 
-class ListColumn(columns.FormattableColumn[list[ty.Any]]):
+class ListColumn(columns.FormattableColumn):  # type: ignore
     """Format column for list content"""
 
     def human_readable(self) -> str:
         return utils.format_list(self._value) or ''
 
-    def machine_readable(self) -> list[ty.Any]:
+    def machine_readable(self) -> ty.List[ty.Any]:
         return [x for x in self._value or []]
 
 
-class ListDictColumn(columns.FormattableColumn[list[dict[str, ty.Any]]]):
+class ListDictColumn(columns.FormattableColumn):  # type: ignore
     """Format column for list of dict content"""
 
     def human_readable(self) -> str:
         return utils.format_list_of_dicts(self._value) or ''
 
-    def machine_readable(self) -> list[dict[str, ty.Any]]:
+    def machine_readable(self) -> ty.List[ty.Dict[str, ty.Any]]:
         return [dict(x) for x in self._value or []]
 
 
-class SizeColumn(columns.FormattableColumn[ty.Union[int, float]]):
+class SizeColumn(columns.FormattableColumn):  # type: ignore
     """Format column for file size content"""
 
     def human_readable(self) -> str:

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/cli/parseractions.py

@@ -16,7 +16,6 @@
 """argparse Custom Actions"""
 
 import argparse
-import collections.abc
 import typing as ty
 
 from osc_lib.i18n import _
@@ -115,11 +114,11 @@ class MultiKeyValueAction(argparse.Action):
         optional_keys: ty.Optional[ty.Sequence[str]] = None,
         const: ty.Optional[_T] = None,
         default: ty.Union[_T, str, None] = None,
-        type: ty.Optional[collections.abc.Callable[[str], _T]] = None,
-        choices: ty.Optional[collections.abc.Iterable[_T]] = None,
+        type: ty.Optional[ty.Callable[[str], _T]] = None,
+        choices: ty.Optional[ty.Iterable[_T]] = None,
         required: bool = False,
         help: ty.Optional[str] = None,
-        metavar: ty.Union[str, tuple[str, ...], None] = None,
+        metavar: ty.Union[str, ty.Tuple[str, ...], None] = None,
     ) -> None:
         """Initialize the action object, and parse customized options
 
@@ -213,7 +212,7 @@ class MultiKeyValueAction(argparse.Action):
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        params: dict[str, str] = {}
+        params: ty.Dict[str, str] = {}
         for kv in values.split(','):
             # Add value if an assignment else raise ArgumentError
             if '=' in kv:
@@ -265,7 +264,7 @@ class MultiKeyValueCommaAction(MultiKeyValueAction):
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        params: dict[str, str] = {}
+        params: ty.Dict[str, str] = {}
         key = ''
         for kv in values.split(','):
             # Add value if an assignment else raise ArgumentError

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/clientmanager.py

@@ -75,7 +75,7 @@ class ClientManager:
     def __init__(
         self,
         cli_options: cloud_region.CloudRegion,
-        api_version: ty.Optional[dict[str, str]],
+        api_version: ty.Optional[ty.Dict[str, str]],
         pw_func: ty.Optional[_PasswordHelper] = None,
         app_name: ty.Optional[str] = None,
         app_version: ty.Optional[str] = None,
@@ -283,5 +283,5 @@ class ClientManager:
             )
         return endpoint
 
-    def get_configuration(self) -> dict[str, ty.Any]:
+    def get_configuration(self) -> ty.Dict[str, ty.Any]:
         return copy.deepcopy(self._cli_options.config)

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/command/command.py

@@ -27,10 +27,10 @@ from osc_lib.i18n import _
 
 class CommandMeta(abc.ABCMeta):
     def __new__(
-        mcs: type['CommandMeta'],
+        mcs: ty.Type['CommandMeta'],
         name: str,
-        bases: tuple[type[ty.Any], ...],
-        namespace: dict[str, ty.Any],
+        bases: ty.Tuple[ty.Type[ty.Any], ...],
+        namespace: ty.Dict[str, ty.Any],
     ) -> 'CommandMeta':
         if 'log' not in namespace:
             namespace['log'] = logging.getLogger(

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/command/timing.py

@@ -29,7 +29,7 @@ class Timing(command.Lister):
 
     def take_action(
         self, parsed_args: argparse.Namespace
-    ) -> tuple[tuple[str, ...], list[ty.Any]]:
+    ) -> ty.Tuple[ty.Tuple[str, ...], ty.List[ty.Any]]:
         column_headers = (
             'URL',
             'Seconds',

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/logs.py

@@ -14,7 +14,6 @@
 """Application logging"""
 
 import argparse
-import collections.abc
 import logging
 import sys
 import typing as ty
@@ -23,7 +22,7 @@ import warnings
 from openstack.config import cloud_config
 
 
-def get_loggers() -> dict[str, str]:
+def get_loggers() -> ty.Dict[str, str]:
     loggers = {}
     for logkey in logging.Logger.manager.loggerDict.keys():
         loggers[logkey] = logging.getLevelName(logging.getLogger(logkey).level)
@@ -57,7 +56,7 @@ def log_level_from_string(level_string: str) -> int:
     return log_level
 
 
-def log_level_from_config(config: collections.abc.Mapping[str, ty.Any]) -> int:
+def log_level_from_config(config: ty.Mapping[str, ty.Any]) -> int:
     # Check the command line option
     verbose_level = config.get('verbose_level')
     if config.get('debug', False):

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/shell.py

@@ -82,7 +82,7 @@ class OpenStackShell(app.App):
     client_manager: clientmanager.ClientManager
 
     log = logging.getLogger(__name__)
-    timing_data: list[ty.Any] = []
+    timing_data: ty.List[ty.Any] = []
 
     def __init__(
         self,
@@ -93,7 +93,7 @@ class OpenStackShell(app.App):
         stdout: ty.Optional[ty.TextIO] = None,
         stderr: ty.Optional[ty.TextIO] = None,
         interactive_app_factory: ty.Optional[
-            type['interactive.InteractiveApp']
+            ty.Type['interactive.InteractiveApp']
         ] = None,
         deferred_help: bool = False,
     ) -> None:
@@ -127,7 +127,7 @@ class OpenStackShell(app.App):
         # Set in subclasses
         self.api_version = None
 
-        self.command_options: list[str] = []
+        self.command_options: ty.List[str] = []
 
         self.do_profile = False
 
@@ -136,7 +136,7 @@ class OpenStackShell(app.App):
         self.log_configurator = logs.LogConfigurator(self.options)
         self.dump_stack_trace = self.log_configurator.dump_trace
 
-    def run(self, argv: list[str]) -> int:
+    def run(self, argv: ty.List[str]) -> int:
         ret_val = 1
         self.command_options = argv
         try:
@@ -180,7 +180,7 @@ class OpenStackShell(app.App):
                 f"osprofiler trace show --html {trace_id} "
             )
 
-    def run_subcommand(self, argv: list[str]) -> int:
+    def run_subcommand(self, argv: ty.List[str]) -> int:
         self.init_profile()
         try:
             ret_value = super().run_subcommand(argv)
@@ -200,7 +200,7 @@ class OpenStackShell(app.App):
         self,
         description: ty.Optional[str],
         version: ty.Optional[str],
-        argparse_kwargs: ty.Optional[dict[str, ty.Any]] = None,
+        argparse_kwargs: ty.Optional[ty.Dict[str, ty.Any]] = None,
     ) -> _argparse.ArgumentParser:
         parser = super().build_option_parser(
             description,
@@ -416,7 +416,7 @@ class OpenStackShell(app.App):
         """
         pass
 
-    def initialize_app(self, argv: list[str]) -> None:
+    def initialize_app(self, argv: ty.List[str]) -> None:
         """Global app init bits:
 
         * set up API versions
@@ -570,7 +570,7 @@ class OpenStackShell(app.App):
             tcmd.run(targs)
 
 
-def main(argv: ty.Optional[list[str]] = None) -> int:
+def main(argv: ty.Optional[ty.List[str]] = None) -> int:
     if argv is None:
         argv = sys.argv[1:]
     return OpenStackShell().run(argv)

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/utils/__init__.py

@@ -16,7 +16,6 @@
 """Common client utilities"""
 
 import argparse
-import collections.abc
 import copy
 import functools
 import getpass
@@ -39,10 +38,10 @@ _T = ty.TypeVar('_T')
 
 
 def backward_compat_col_lister(
-    column_headers: list[str],
-    columns: list[str],
-    column_map: dict[str, str],
-) -> list[str]:
+    column_headers: ty.List[str],
+    columns: ty.List[str],
+    column_map: ty.Dict[str, str],
+) -> ty.List[str]:
     """Convert the column headers to keep column backward compatibility.
 
     Replace the new column name of column headers by old name, so that
@@ -75,10 +74,10 @@ def backward_compat_col_lister(
 
 
 def backward_compat_col_showone(
-    show_object: collections.abc.MutableMapping[str, _T],
-    columns: list[str],
-    column_map: dict[str, str],
-) -> collections.abc.MutableMapping[str, _T]:
+    show_object: ty.MutableMapping[str, _T],
+    columns: ty.List[str],
+    column_map: ty.Dict[str, str],
+) -> ty.MutableMapping[str, _T]:
     """Convert the output object to keep column backward compatibility.
 
     Replace the new column name of output object by old name, so that
@@ -108,7 +107,7 @@ def backward_compat_col_showone(
     return show_object
 
 
-def build_kwargs_dict(arg_name: str, value: _T) -> dict[str, _T]:
+def build_kwargs_dict(arg_name: str, value: _T) -> ty.Dict[str, _T]:
     """Return a dictionary containing `arg_name` if `value` is set."""
     kwargs = {}
     if value:
@@ -117,10 +116,10 @@ def build_kwargs_dict(arg_name: str, value: _T) -> dict[str, _T]:
 
 
 def calculate_header_and_attrs(
-    column_headers: collections.abc.Sequence[str],
-    attrs: collections.abc.Sequence[str],
+    column_headers: ty.Sequence[str],
+    attrs: ty.Sequence[str],
     parsed_args: argparse.Namespace,
-) -> tuple[collections.abc.Sequence[str], collections.abc.Sequence[str]]:
+) -> ty.Tuple[ty.Sequence[str], ty.Sequence[str]]:
     """Calculate headers and attribute names based on parsed_args.column.
 
     When --column (-c) option is specified, this function calculates
@@ -173,10 +172,10 @@ def env(*vars: str, **kwargs: ty.Any) -> ty.Optional[str]:
 
 
 def find_min_match(
-    items: collections.abc.Sequence[_T],
+    items: ty.Sequence[_T],
     sort_attr: str,
     **kwargs: ty.Any,
-) -> collections.abc.Sequence[_T]:
+) -> ty.Sequence[_T]:
     """Find all resources meeting the given minimum constraints
 
     :param items: A List of objects to consider
@@ -328,7 +327,7 @@ def find_resource(
 
 
 def format_dict(
-    data: dict[str, ty.Any], prefix: ty.Optional[str] = None
+    data: ty.Dict[str, ty.Any], prefix: ty.Optional[str] = None
 ) -> str:
     """Return a formatted string of key value pairs
 
@@ -358,7 +357,7 @@ def format_dict(
 
 
 def format_dict_of_list(
-    data: ty.Optional[dict[str, list[ty.Any]]], separator: str = '; '
+    data: ty.Optional[ty.Dict[str, ty.List[ty.Any]]], separator: str = '; '
 ) -> ty.Optional[str]:
     """Return a formatted string of key value pair
 
@@ -385,7 +384,7 @@ def format_dict_of_list(
 
 
 def format_list(
-    data: ty.Optional[list[ty.Any]], separator: str = ', '
+    data: ty.Optional[ty.List[ty.Any]], separator: str = ', '
 ) -> ty.Optional[str]:
     """Return a formatted strings
 
@@ -400,7 +399,7 @@ def format_list(
 
 
 def format_list_of_dicts(
-    data: ty.Optional[list[dict[str, ty.Any]]],
+    data: ty.Optional[ty.List[ty.Dict[str, ty.Any]]],
 ) -> ty.Optional[str]:
     """Return a formatted string of key value pairs for each dict
 
@@ -445,7 +444,7 @@ def format_size(size: ty.Union[int, float, None]) -> str:
 def get_client_class(
     api_name: str,
     version: ty.Union[str, int, float],
-    version_map: dict[str, type[_T]],
+    version_map: ty.Dict[str, ty.Type[_T]],
 ) -> ty.Any:
     """Returns the client class for the requested API version
 
@@ -483,13 +482,13 @@ def get_client_class(
 
 
 def get_dict_properties(
-    item: dict[str, _T],
-    fields: collections.abc.Sequence[str],
-    mixed_case_fields: ty.Optional[collections.abc.Sequence[str]] = None,
-    formatters: ty.Optional[
-        dict[str, type[cliff_columns.FormattableColumn[ty.Any]]]
+    item: ty.Dict[str, _T],
+    fields: ty.Sequence[str],
+    mixed_case_fields: ty.Optional[ty.Sequence[str]] = None,
+    formatters: ty.Optional[  # type: ignore
+        ty.Dict[str, ty.Type[cliff_columns.FormattableColumn]]
     ] = None,
-) -> tuple[ty.Any, ...]:
+) -> ty.Tuple[ty.Any, ...]:
     """Return a tuple containing the item properties.
 
     :param item: a single dict resource
@@ -535,13 +534,13 @@ def get_dict_properties(
 
 
 def get_item_properties(
-    item: dict[str, _T],
-    fields: collections.abc.Sequence[str],
-    mixed_case_fields: ty.Optional[collections.abc.Sequence[str]] = None,
-    formatters: ty.Optional[
-        dict[str, type[cliff_columns.FormattableColumn[ty.Any]]]
+    item: ty.Dict[str, _T],
+    fields: ty.Sequence[str],
+    mixed_case_fields: ty.Optional[ty.Sequence[str]] = None,
+    formatters: ty.Optional[  # type: ignore
+        ty.Dict[str, ty.Type[cliff_columns.FormattableColumn]]
     ] = None,
-) -> tuple[ty.Any, ...]:
+) -> ty.Tuple[ty.Any, ...]:
     """Return a tuple containing the item properties.
 
     :param item: a single item resource (e.g. Server, Project, etc)
@@ -656,10 +655,10 @@ def read_blob_file_contents(blob_file: str) -> str:
 
 
 def sort_items(
-    items: collections.abc.Sequence[_T],
+    items: ty.Sequence[_T],
     sort_str: str,
-    sort_type: ty.Optional[type[ty.Any]] = None,
-) -> collections.abc.Sequence[_T]:
+    sort_type: ty.Optional[ty.Type[ty.Any]] = None,
+) -> ty.Sequence[_T]:
     """Sort items based on sort keys and sort directions given by sort_str.
 
     :param items: a list or generator object of items
@@ -720,11 +719,11 @@ def wait_for_delete(
     manager: ty.Any,
     res_id: str,
     status_field: str = 'status',
-    error_status: collections.abc.Sequence[str] = ['error'],
-    exception_name: collections.abc.Sequence[str] = ['NotFound'],
+    error_status: ty.Sequence[str] = ['error'],
+    exception_name: ty.Sequence[str] = ['NotFound'],
     sleep_time: int = 5,
     timeout: int = 300,
-    callback: ty.Optional[collections.abc.Callable[[int], None]] = None,
+    callback: ty.Optional[ty.Callable[[int], None]] = None,
 ) -> bool:
     """Wait for resource deletion
 
@@ -776,13 +775,13 @@ def wait_for_delete(
 
 
 def wait_for_status(
-    status_f: collections.abc.Callable[[str], object],
+    status_f: ty.Callable[[str], object],
     res_id: str,
     status_field: str = 'status',
-    success_status: collections.abc.Sequence[str] = ['active'],
-    error_status: collections.abc.Sequence[str] = ['error'],
+    success_status: ty.Sequence[str] = ['active'],
+    error_status: ty.Sequence[str] = ['error'],
     sleep_time: int = 5,
-    callback: ty.Optional[collections.abc.Callable[[int], None]] = None,
+    callback: ty.Optional[ty.Callable[[int], None]] = None,
 ) -> bool:
     """Wait for status change on a resource during a long-running operation
 
@@ -819,9 +818,9 @@ def wait_for_status(
 
 def get_osc_show_columns_for_sdk_resource(
     sdk_resource: resource.Resource,
-    osc_column_map: dict[str, str],
-    invisible_columns: ty.Optional[collections.abc.Sequence[str]] = None,
-) -> tuple[tuple[str, ...], tuple[str, ...]]:
+    osc_column_map: ty.Dict[str, str],
+    invisible_columns: ty.Optional[ty.Sequence[str]] = None,
+) -> ty.Tuple[ty.Tuple[str, ...], ty.Tuple[str, ...]]:
     """Get and filter the display and attribute columns for an SDK resource.
 
     Common utility function for preparing the output of an OSC show command.

{osc_lib-4.0.0 → osc_lib-4.0.1}/osc_lib/utils/columns.py

@@ -19,8 +19,8 @@ LIST_LONG_ONLY = 'long_only'
 
 
 def get_column_definitions(
-    attr_map: list[tuple[str, str, str]], long_listing: bool
-) -> tuple[list[str], list[str]]:
+    attr_map: ty.List[ty.Tuple[str, str, str]], long_listing: bool
+) -> ty.Tuple[ty.List[str], ty.List[str]]:
     """Return table headers and column names for a listing table.
 
     An attribute map (attr_map) is a list of table entry definitions
@@ -77,9 +77,9 @@ def get_column_definitions(
 
 
 def get_columns(
-    item: dict[str, ty.Any],
-    attr_map: ty.Optional[list[tuple[str, str, str]]] = None,
-) -> tuple[tuple[str, ...], tuple[str, ...]]:
+    item: ty.Dict[str, ty.Any],
+    attr_map: ty.Optional[ty.List[ty.Tuple[str, str, str]]] = None,
+) -> ty.Tuple[ty.Tuple[str, ...], ty.Tuple[str, ...]]:
     """Return pair of resource attributes and corresponding display names.
 
     :param item: a dictionary which represents a resource.