Merge "typing: Use objects from typing (redux)"

Author: Zuul

openstackclient/network/v2/fwaas/group.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import logging
-import typing
+from typing import Any
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import identity as identity_utils
@@ -398,7 +398,7 @@ def get_parser(self, prog_name):
         return parser
 
     def _get_attrs(self, client, parsed_args):
-        attrs: dict[str, typing.Any] = {}
+        attrs: dict[str, Any] = {}
         if parsed_args.ingress_firewall_policy:
             attrs['ingress_firewall_policy_id'] = None
         if parsed_args.egress_firewall_policy:

openstackclient/network/v2/fwaas/policy.py

@@ -12,10 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
 
 import logging
-import typing
+from typing import Any
 
 from osc_lib.cli import identity as identity_utils
 from osc_lib import exceptions
@@ -456,7 +455,7 @@ def get_parser(self, prog_name):
         return parser
 
     def _get_attrs(self, client_manager, parsed_args):
-        attrs: dict[str, typing.Any] = {}
+        attrs: dict[str, Any] = {}
         client = client_manager.network
 
         if parsed_args.firewall_rule:

openstackclient/network/v2/fwaas/rule.py

@@ -12,9 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
+
 import logging
-import typing
+from typing import Any
 
 from cliff import columns as cliff_columns
 from osc_lib.cli import identity as identity_utils
@@ -505,7 +505,7 @@ def get_parser(self, prog_name):
         return parser
 
     def _get_attrs(self, client_manager, parsed_args):
-        attrs: dict[str, typing.Any] = {}
+        attrs: dict[str, Any] = {}
         if parsed_args.source_ip_address:
             attrs['source_ip_address'] = None
         if parsed_args.source_port: