typing: Use objects from typing

Change-Id: I9211e2918324e5e8135051a7c2279ee574b0e243
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/common/clientmanager.py

@@ -20,14 +20,14 @@
 import importlib
 import logging
 import sys
-import typing as ty
+from typing import TYPE_CHECKING, Any, Protocol, TypeVar, runtime_checkable
 
 from osc_lib.cli import client_config
 from osc_lib import clientmanager
 from osc_lib import shell
 import stevedore
 
-if ty.TYPE_CHECKING:
+if TYPE_CHECKING:
     from keystoneauth1 import access as ksa_access
     from openstack.compute.v2 import _proxy as compute_proxy
     from openstack.image.v2 import _proxy as image_proxy
@@ -37,7 +37,7 @@
 
 LOG = logging.getLogger(__name__)
 
-PLUGIN_MODULES: list[ty.Any] = []
+PLUGIN_MODULES: list[Any] = []
 
 USER_AGENT = 'python-openstackclient'
 
@@ -50,7 +50,7 @@ class ClientManager(clientmanager.ClientManager):
     in osc-lib so we need to maintain a transition period.
     """
 
-    if ty.TYPE_CHECKING:
+    if TYPE_CHECKING:
         # we know this will be set by us and will not be nullable
         auth_ref: ksa_access.AccessInfo
 
@@ -62,11 +62,11 @@ class ClientManager(clientmanager.ClientManager):
         # services...
         # TODO(stephenfin): We also need to migrate object storage...
         compute: compute_proxy.Proxy
-        identity: ty.Any
+        identity: Any
         image: image_proxy.Proxy
         network: network_proxy.Proxy
         object_store: object_store_v1.APIv1
-        volume: ty.Any
+        volume: Any
 
     def __init__(
         self,
@@ -179,17 +179,17 @@ def is_volume_endpoint_enabled(self, volume_client=None):
 
 # Plugin Support
 
-ArgumentParserT = ty.TypeVar('ArgumentParserT', bound=argparse.ArgumentParser)
+ArgumentParserT = TypeVar('ArgumentParserT', bound=argparse.ArgumentParser)
 
 
-@ty.runtime_checkable  # Optional: allows usage with isinstance()
-class PluginModule(ty.Protocol):
+@runtime_checkable  # Optional: allows usage with isinstance()
+class PluginModule(Protocol):
     DEFAULT_API_VERSION: str
     API_VERSION_OPTION: str
     API_NAME: str
     API_VERSIONS: tuple[str]
 
-    make_client: Callable[..., ty.Any]
+    make_client: Callable[..., Any]
     build_option_parser: Callable[[ArgumentParserT], ArgumentParserT]
     check_api_version: Callable[[str], bool]
 

openstackclient/common/project_cleanup.py

@@ -17,7 +17,7 @@
 import logging
 import os
 import queue
-import typing as ty
+from typing import Any
 
 from cliff.formatters import table
 from openstack import utils as sdk_utils
@@ -107,7 +107,7 @@ def take_action(self, parsed_args):
             connection = connection.connect_as_project(project)
 
         if connection:
-            status_queue: queue.Queue[ty.Any] = queue.Queue()
+            status_queue: queue.Queue[Any] = queue.Queue()
             parsed_args.max_width = int(
                 os.environ.get('CLIFF_MAX_TERM_WIDTH', 0)
             )

openstackclient/common/quota.py

@@ -18,7 +18,7 @@
 import itertools
 import logging
 import sys
-import typing as ty
+from typing import Any
 
 from openstack import exceptions as sdk_exceptions
 from openstack import utils as sdk_utils
@@ -203,7 +203,7 @@ def _network_quota_to_dict(network_quota, detail=False):
         #
         # so we need to make conversion to have data in same format from
         # all of the services
-        result: dict[str, ty.Any] = {"usage": {}, "reservation": {}}
+        result: dict[str, Any] = {"usage": {}, "reservation": {}}
         for key, values in dict_quota.items():
             if values is None:
                 continue

openstackclient/compute/v2/aggregate.py

@@ -17,7 +17,7 @@
 """Compute v2 Aggregate action implementations"""
 
 import logging
-import typing as ty
+from typing import Any
 
 from cliff import columns
 from openstack import utils as sdk_utils
@@ -33,7 +33,7 @@
 LOG = logging.getLogger(__name__)
 
 
-_aggregate_formatters: dict[str, type[columns.FormattableColumn[ty.Any]]] = {
+_aggregate_formatters: dict[str, type[columns.FormattableColumn[Any]]] = {
     'Hosts': format_columns.ListColumn,
     'Metadata': format_columns.DictColumn,
     'hosts': format_columns.ListColumn,
@@ -323,7 +323,7 @@ def take_action(self, parsed_args):
         if kwargs:
             compute_client.update_aggregate(aggregate.id, **kwargs)
 
-        properties: dict[str, ty.Any] = {}
+        properties: dict[str, Any] = {}
         if parsed_args.no_property:
             # NOTE(RuiChen): "availability_zone" can not be unset from
             # properties. It is already excluded from show and create output.

openstackclient/compute/v2/server.py

@@ -21,7 +21,7 @@
 import json
 import logging
 import os
-import typing as ty
+from typing import Any
 
 from cliff import columns as cliff_columns
 import iso8601
@@ -66,7 +66,7 @@ def human_readable(self):
             return 'N/A'
 
 
-class AddressesColumn(cliff_columns.FormattableColumn[ty.Any]):
+class AddressesColumn(cliff_columns.FormattableColumn[Any]):
     """Generate a formatted string of a server's addresses."""
 
     def human_readable(self):

openstackclient/compute/v2/server_group.py

@@ -16,7 +16,7 @@
 """Compute v2 Server Group action implementations"""
 
 import logging
-import typing as ty
+from typing import Any
 
 from cliff import columns
 from openstack import utils as sdk_utils
@@ -32,7 +32,7 @@
 LOG = logging.getLogger(__name__)
 
 
-_formatters: dict[str, type[columns.FormattableColumn[ty.Any]]] = {
+_formatters: dict[str, type[columns.FormattableColumn[Any]]] = {
     'member_ids': format_columns.ListColumn,
     'policies': format_columns.ListColumn,
     'rules': format_columns.DictColumn,

openstackclient/compute/v2/usage.py

@@ -18,7 +18,7 @@
 from collections.abc import Collection
 import datetime
 import functools
-import typing as ty
+from typing import Any
 
 from cliff import columns as cliff_columns
 from osc_lib import utils
@@ -55,7 +55,7 @@ def human_readable(self):
         return project
 
 
-class CountColumn(cliff_columns.FormattableColumn[Collection[ty.Any]]):
+class CountColumn(cliff_columns.FormattableColumn[Collection[Any]]):
     def human_readable(self):
         return len(self._value) if self._value is not None else None
 

openstackclient/identity/v2_0/catalog.py

@@ -14,7 +14,7 @@
 """Identity v2 Service Catalog action implementations"""
 
 import logging
-import typing as ty
+from typing import Any
 
 from cliff import columns as cliff_columns
 from osc_lib import exceptions
@@ -27,7 +27,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class EndpointsColumn(cliff_columns.FormattableColumn[ty.Any]):
+class EndpointsColumn(cliff_columns.FormattableColumn[Any]):
     def human_readable(self):
         if not self._value:
             return ""

openstackclient/identity/v3/application_credential.py

@@ -18,7 +18,7 @@
 import datetime
 import json
 import logging
-import typing as ty
+from typing import Any
 import uuid
 
 from cliff import columns as cliff_columns
@@ -33,7 +33,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class RolesColumn(cliff_columns.FormattableColumn[ty.Any]):
+class RolesColumn(cliff_columns.FormattableColumn[Any]):
     """Generate a formatted string of role names."""
 
     def human_readable(self):

openstackclient/identity/v3/catalog.py

@@ -13,7 +13,7 @@
 """Identity v3 Service Catalog action implementations"""
 
 import logging
-import typing as ty
+from typing import Any
 
 from cliff import columns as cliff_columns
 from osc_lib import exceptions
@@ -26,7 +26,7 @@
 LOG = logging.getLogger(__name__)
 
 
-class EndpointsColumn(cliff_columns.FormattableColumn[ty.Any]):
+class EndpointsColumn(cliff_columns.FormattableColumn[Any]):
     def human_readable(self):
         if not self._value:
             return ""