[types] Perform changes on type hints based on ty warnings

Author: alorence

modernrpc/compat.py

@@ -22,7 +22,7 @@ def async_csrf_exempt(view):
 if sys.version_info >= (3, 14):
 
     def is_union_type(_type: type):
-        return isinstance(_type, typing.Union)
+        return isinstance(_type, types.UnionType)
 
 elif sys.version_info >= (3, 10):
 

modernrpc/xmlrpc/backends/marshalling.py

@@ -24,7 +24,7 @@
     NoneType = type(None)  # type: ignore[misc]
 
 
-class ElementTypeProtocol(Protocol, Iterable):
+class ElementTypeProtocol(Iterable, Protocol):
     """
     Base protocol for XML element types. This reflects the API of both the xml.etree and the lxml library.
     Unfortunately, since both libraries share the same interface without inheriting a common base class, we

tests/conftest.py

@@ -76,7 +76,7 @@ def factory(
 
 @pytest.fixture
 def jsonrpc_batch_rf(rf) -> Callable[..., HttpRequest]:
-    def factory(path="/rpc", content_type="application/json", requests: list[str, tuple, bool] | None = None):
+    def factory(path="/rpc", content_type="application/json", requests: list[tuple[str, tuple, bool]] | None = None):
         data = [
             build_json_rpc_request_data(method=method_name, params=params, is_notification=is_notification)
             for method_name, params, is_notification in requests or []

tests/test_proc_wrapper.py

@@ -297,7 +297,7 @@ class TestArgsTypeHint:
     @pytest.fixture
     def wrapper(self):
         def typed_args(a: int, b: str, c: list | float) -> dict | list:
-            pass
+            return []
 
         return ProcedureWrapper(typed_args)
 
@@ -345,6 +345,7 @@ def typehints_and_standard_docstring(a: str, b, c: float) -> float:
             :param c: param C
             :return: A decimal value
             """
+            return 1.33
 
         return ProcedureWrapper(typehints_and_standard_docstring)
 
@@ -423,6 +424,7 @@ def typehints_and_types_docstring(x: list, y: str) -> dict:
             :type y: int
             :rtype: str
             """
+            return {}
 
         return ProcedureWrapper(typehints_and_types_docstring)
 
@@ -453,8 +455,9 @@ class TestWithTypeHintAndKwargs:
 
     @pytest.fixture
     def wrapper(self):
-        def with_kwargs(x: list, y: str, **kwargs) -> dict:
+        def with_kwargs(x: list, y: str, **kwargs) -> str:
             """This is the docstring part of the function"""
+            return "abcdefgh"
 
         return ProcedureWrapper(with_kwargs)
 
@@ -470,7 +473,7 @@ def test_arguments(self, wrapper):
         }
 
     def test_returns(self, wrapper):
-        assert wrapper.returns == ProcedureArgDocs(docstring="", doc_type="", type_hint=dict)
+        assert wrapper.returns == ProcedureArgDocs(docstring="", doc_type="", type_hint=str)
 
     def test_default_html_doc(self, wrapper):
         assert wrapper.text_doc == "This is the docstring part of the function"