Remove deprecated use of typing Any, Dict.

This commit removes deprecated type hints Any and Dict from typing.

1. from typing import * statements are removed.

2. function signatures are modified to use the new recommended type hints.

While a lot of files are changed, there are no other changes to any of the files.

Author: allenrobel

plugins/module_utils/common/merge_dicts.py

@@ -22,7 +22,6 @@
 import inspect
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, Dict
 
 
 class MergeDicts:
@@ -78,9 +77,7 @@ def commit(self) -> None:
 
         self.properties["dict_merged"] = self.merge_dicts(self.dict1, self.dict2)
 
-    def merge_dicts(
-        self, dict1: Dict[Any, Any], dict2: Dict[Any, Any]
-    ) -> Dict[Any, Any]:
+    def merge_dicts(self, dict1: dict, dict2: dict) -> dict:
         """
         Merge dict2 into dict1 and return dict1.
         Keys in dict2 have precedence over keys in dict1.

plugins/module_utils/common/merge_dicts_v2.py

@@ -22,7 +22,6 @@
 import inspect
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, Dict
 
 
 class MergeDicts:
@@ -90,9 +89,7 @@ def commit(self) -> None:
 
         self.properties["dict_merged"] = self.merge_dicts(self.dict1, self.dict2)
 
-    def merge_dicts(
-        self, dict1: Dict[Any, Any], dict2: Dict[Any, Any]
-    ) -> Dict[Any, Any]:
+    def merge_dicts(self, dict1: dict, dict2: dict) -> dict:
         """
         Merge dict2 into dict1 and return dict1.
         Keys in dict2 have precedence over keys in dict1.

plugins/module_utils/common/params_merge_defaults.py

@@ -22,7 +22,6 @@
 import inspect
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, Dict
 
 
 class ParamsMergeDefaults:
@@ -75,9 +74,7 @@ def _build_reserved_params(self):
         self.reserved_params.add("type")
         self.reserved_params.add("preferred_type")
 
-    def _merge_default_params(
-        self, spec: Dict[str, Any], params: Dict[str, Any]
-    ) -> Dict[str, Any]:
+    def _merge_default_params(self, spec: dict, params: dict) -> dict:
         """
         Merge default parameters into parameters.
 

plugins/module_utils/common/params_merge_defaults_v2.py

@@ -22,7 +22,6 @@
 import inspect
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, Dict
 
 
 class ParamsMergeDefaults:
@@ -84,9 +83,7 @@ def _build_reserved_params(self):
         self.reserved_params.add("type")
         self.reserved_params.add("preferred_type")
 
-    def _merge_default_params(
-        self, spec: Dict[str, Any], params: Dict[str, Any]
-    ) -> Dict[str, Any]:
+    def _merge_default_params(self, spec: dict, params: dict) -> dict:
         """
         ### Summary
         Merge default parameters into parameters.

plugins/module_utils/common/params_validate.py

@@ -22,7 +22,6 @@
 import ipaddress
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, List
 
 from ansible.module_utils.common import validation
 
@@ -53,7 +52,7 @@ class ParamsValidate:
     -   ``bar`` can be assigned one of three values: bingo, bango, or bongo.
 
     ```python
-    params_spec: Dict[str, Any] = {}
+    params_spec: dict = {}
     params_spec["ip_address"] = {}
     params_spec["ip_address"]["required"] = False
     params_spec["ip_address"]["type"] = "ipv4"
@@ -270,7 +269,7 @@ def _validate_parameters(self, spec, parameters):
                     param,
                 )
 
-    def _verify_choices(self, choices: List[Any], value: Any, param: str) -> None:
+    def _verify_choices(self, choices: list, value, param: str) -> None:
         """
         Verify that value is one of the choices
         """
@@ -309,7 +308,7 @@ def _verify_integer_range(
             msg += f"Got {value}"
             self.ansible_module.fail_json(msg)
 
-    def _verify_type(self, expected_type: str, params: Any, param: str) -> Any:
+    def _verify_type(self, expected_type: str, params, param: str):
         """
         Verify that value's type matches the expected type
         """
@@ -330,7 +329,7 @@ def _verify_type(self, expected_type: str, params: Any, param: str) -> Any:
             self._invalid_type(expected_type, value, param, err)
             return value
 
-    def _ipaddress_guard(self, expected_type, value: Any, param: str) -> None:
+    def _ipaddress_guard(self, expected_type, value, param: str) -> None:
         """
         Guard against int and bool types for ipv4, ipv6, ipv4_subnet,
         and ipv6_subnet type.
@@ -357,7 +356,7 @@ def _ipaddress_guard(self, expected_type, value: Any, param: str) -> None:
         raise TypeError(f"{msg}")
 
     def _invalid_type(
-        self, expected_type: str, value: Any, param: str, error: str = ""
+        self, expected_type: str, value, param: str, error: str = ""
     ) -> None:
         """
         Calls fail_json when value's type does not match expected_type
@@ -371,8 +370,8 @@ def _invalid_type(
         self.ansible_module.fail_json(msg)
 
     def _verify_multitype(  # pylint: disable=inconsistent-return-statements
-        self, spec: Any, params: Any, param: str
-    ) -> Any:
+        self, spec, params, param: str
+    ):
         """
         Verify that value's type matches one of the types in expected_types
 
@@ -427,7 +426,7 @@ def _verify_multitype(  # pylint: disable=inconsistent-return-statements
         self.ansible_module.fail_json(msg)
 
     def _verify_preferred_type_param_spec_is_present(
-        self, spec: Any, param: str
+        self, spec, param: str
     ) -> None:
         """
         verify that spec contains the key 'preferred_type'
@@ -440,7 +439,7 @@ def _verify_preferred_type_param_spec_is_present(
             self.ansible_module.fail_json(msg)
 
     def _verify_preferred_type_for_standard_types(
-        self, preferred_type: str, value: Any
+        self, preferred_type: str, value
     ) -> tuple:
         """
         If preferred_type is one of the standard python types
@@ -461,7 +460,7 @@ def _verify_preferred_type_for_standard_types(
         return (False, value)
 
     def _verify_preferred_type_for_ipaddress_types(
-        self, preferred_type: str, value: Any
+        self, preferred_type: str, value
     ) -> tuple:
         """
         We can't use isinstance() to verify ipaddress types.
@@ -479,7 +478,7 @@ def _verify_preferred_type_for_ipaddress_types(
         return (False, value)
 
     @staticmethod
-    def _validate_ipv4_address(value: Any) -> Any:
+    def _validate_ipv4_address(value):
         """
         verify that value is an IPv4 address
         """
@@ -490,7 +489,7 @@ def _validate_ipv4_address(value: Any) -> Any:
             raise ValueError(f"invalid IPv4 address: {err}") from err
 
     @staticmethod
-    def _validate_ipv4_subnet(value: Any) -> Any:
+    def _validate_ipv4_subnet(value):
         """
         verify that value is an IPv4 network
         """
@@ -501,7 +500,7 @@ def _validate_ipv4_subnet(value: Any) -> Any:
             raise ValueError(f"invalid IPv4 network: {err}") from err
 
     @staticmethod
-    def _validate_ipv6_address(value: Any) -> Any:
+    def _validate_ipv6_address(value):
         """
         verify that value is an IPv6 address
         """
@@ -512,7 +511,7 @@ def _validate_ipv6_address(value: Any) -> Any:
             raise ValueError(f"invalid IPv6 address: {err}") from err
 
     @staticmethod
-    def _validate_ipv6_subnet(value: Any) -> Any:
+    def _validate_ipv6_subnet(value):
         """
         verify that value is an IPv6 network
         """
@@ -523,7 +522,7 @@ def _validate_ipv6_subnet(value: Any) -> Any:
             raise ValueError(f"invalid IPv6 network: {err}") from err
 
     @staticmethod
-    def _validate_set(value: Any) -> Any:
+    def _validate_set(value):
         """
         verify that value is a set
         """
@@ -532,7 +531,7 @@ def _validate_set(value: Any) -> Any:
         return value
 
     @staticmethod
-    def _validate_tuple(value: Any) -> Any:
+    def _validate_tuple(value):
         """
         verify that value is a tuple
         """

plugins/module_utils/common/params_validate_v2.py

@@ -22,7 +22,6 @@
 import ipaddress
 import logging
 from collections.abc import MutableMapping as Map
-from typing import Any, List
 
 from ansible.module_utils.common import validation
 
@@ -48,7 +47,7 @@ class ParamsValidate:
     -   ``bar`` can be assigned one of three values: bingo, bango, or bongo.
 
     ```python
-    params_spec: Dict[str, Any] = {}
+    params_spec: dict = {}
     params_spec["ip_address"] = {}
     params_spec["ip_address"]["required"] = False
     params_spec["ip_address"]["type"] = "ipv4"
@@ -300,7 +299,7 @@ def _validate_parameters(self, spec, parameters):
         except (TypeError, ValueError) as error:
             raise ValueError(error) from error
 
-    def _verify_choices(self, choices: List[Any], value: Any, param: str) -> None:
+    def _verify_choices(self, choices: list, value, param: str) -> None:
         """
         ### Summary
         Verify that value is one of the choices
@@ -351,7 +350,7 @@ def _verify_integer_range(
             msg += f"Got {value}"
             raise ValueError(msg)
 
-    def _verify_type(self, expected_type: str, params: Any, param: str):
+    def _verify_type(self, expected_type: str, params, param: str):
         """
         ### Summary
         Verify that value's type matches the expected type
@@ -384,7 +383,7 @@ def _verify_type(self, expected_type: str, params: Any, param: str):
 
         return return_value
 
-    def _ipaddress_guard(self, expected_type, value: Any, param: str) -> None:
+    def _ipaddress_guard(self, expected_type, value, param: str) -> None:
         """
         ### Summary
         Guard against int and bool types for ipv4, ipv6, ipv4_subnet,
@@ -414,7 +413,7 @@ def _ipaddress_guard(self, expected_type, value: Any, param: str) -> None:
         raise TypeError(msg)
 
     def _invalid_type(
-        self, expected_type: str, value: Any, param: str, error: str = ""
+        self, expected_type: str, value, param: str, error: str = ""
     ) -> None:
         """
         ### Summary
@@ -431,9 +430,7 @@ def _invalid_type(
         msg += f"Error detail: {error}"
         raise TypeError(msg)
 
-    def _verify_multitype(  # pylint: disable=inconsistent-return-statements
-        self, spec: Any, params: Any, param: str
-    ) -> Any:
+    def _verify_multitype(self, spec, params, param: str):
         """
         ### Summary
         Verify that value's type matches one of the types in expected_types
@@ -448,6 +445,7 @@ def _verify_multitype(  # pylint: disable=inconsistent-return-statements
         1.  We've disabled inconsistent-return-statements.  We're pretty
             sure this method is correct.
         """
+        # pylint: disable=inconsistent-return-statements
         method_name = inspect.stack()[0][3]
 
         # preferred_type is mandatory for multitype
@@ -497,9 +495,7 @@ def _verify_multitype(  # pylint: disable=inconsistent-return-statements
         msg += f"Got '{value}'."
         raise TypeError(msg)
 
-    def _verify_preferred_type_param_spec_is_present(
-        self, spec: Any, param: str
-    ) -> None:
+    def _verify_preferred_type_param_spec_is_present(self, spec, param: str) -> None:
         """
         ### Summary
         Verify that spec contains the key 'preferred_type'
@@ -515,7 +511,7 @@ def _verify_preferred_type_param_spec_is_present(
             raise KeyError(msg)
 
     def _verify_preferred_type_for_standard_types(
-        self, preferred_type: str, value: Any
+        self, preferred_type: str, value
     ) -> tuple:
         """
         If preferred_type is one of the standard python types
@@ -536,7 +532,7 @@ def _verify_preferred_type_for_standard_types(
         return (False, value)
 
     def _verify_preferred_type_for_ipaddress_types(
-        self, preferred_type: str, value: Any
+        self, preferred_type: str, value
     ) -> tuple:
         """
         We can't use isinstance() to verify ipaddress types.
@@ -554,7 +550,7 @@ def _verify_preferred_type_for_ipaddress_types(
         return (False, value)
 
     @staticmethod
-    def _validate_ipv4_address(value: Any) -> Any:
+    def _validate_ipv4_address(value):
         """
         verify that value is an IPv4 address
         """
@@ -565,7 +561,7 @@ def _validate_ipv4_address(value: Any) -> Any:
             raise ValueError(f"invalid IPv4 address: {err}") from err
 
     @staticmethod
-    def _validate_ipv4_subnet(value: Any) -> Any:
+    def _validate_ipv4_subnet(value):
         """
         verify that value is an IPv4 network
         """
@@ -576,7 +572,7 @@ def _validate_ipv4_subnet(value: Any) -> Any:
             raise ValueError(f"invalid IPv4 network: {err}") from err
 
     @staticmethod
-    def _validate_ipv6_address(value: Any) -> Any:
+    def _validate_ipv6_address(value):
         """
         verify that value is an IPv6 address
         """
@@ -587,7 +583,7 @@ def _validate_ipv6_address(value: Any) -> Any:
             raise ValueError(f"invalid IPv6 address: {err}") from err
 
     @staticmethod
-    def _validate_ipv6_subnet(value: Any) -> Any:
+    def _validate_ipv6_subnet(value):
         """
         verify that value is an IPv6 network
         """
@@ -598,7 +594,7 @@ def _validate_ipv6_subnet(value: Any) -> Any:
             raise ValueError(f"invalid IPv6 network: {err}") from err
 
     @staticmethod
-    def _validate_set(value: Any) -> Any:
+    def _validate_set(value):
         """
         verify that value is a set
         """
@@ -607,7 +603,7 @@ def _validate_set(value: Any) -> Any:
         return value
 
     @staticmethod
-    def _validate_tuple(value: Any) -> Any:
+    def _validate_tuple(value):
         """
         verify that value is a tuple
         """