Fix tests for Python 3.9

Author: smt5541

flask_parameter_validation/docs_blueprint.py

@@ -76,11 +76,19 @@ def get_arg_type_hint(fdocs, arg_name):
     """
     arg_type = fdocs["argspec"].annotations[arg_name]
     def recursively_resolve_type_hint(type_to_resolve):
+        if hasattr(type_to_resolve, "__name__"):  # In Python 3.9, Optional and Union do not have __name__
+            type_base_name = type_to_resolve.__name__
+        elif hasattr(type_to_resolve, "_name") and type_to_resolve._name is not None:
+            # In Python 3.9, _name exists on list[whatever] and has a non-None value
+            type_base_name = type_to_resolve._name
+        else:
+            # But, in Python 3.9, Optional[whatever] has _name of None - but its __origin__ is Union
+            type_base_name = type_to_resolve.__origin__._name
         if hasattr(type_to_resolve, "__args__"):
             return (
-                f"{type_to_resolve.__name__}[{', '.join([recursively_resolve_type_hint(a) for a in type_to_resolve.__args__])}]"
+                f"{type_base_name}[{', '.join([recursively_resolve_type_hint(a) for a in type_to_resolve.__args__])}]"
             )
-        return type_to_resolve.__name__
+        return type_base_name
     return recursively_resolve_type_hint(arg_type)
 
 

flask_parameter_validation/test/test_api_docs.py

@@ -1,11 +1,12 @@
+import sys
 from flask_parameter_validation.docs_blueprint import get_route_docs
 
 def test_http_ok(client):
     r = client.get("/docs/")
     assert r.status_code == 200
     r = client.get("/docs/json")
     assert r.status_code == 200
-
+import sys
 def test_routes_added(app):
     routes = []
     for rule in app.url_map.iter_rules():
@@ -20,18 +21,19 @@ def test_doc_types_of_default(app):
         "query": "Query",
         "route": "Route"
     }
+    optional_as_str = "Optional" if sys.version_info >= (3,10) else "Union"
     types = {
-        "bool": {"opt": "Optional[bool, NoneType]", "n_opt": "bool"},
-        "date": {"opt": "Optional[date, NoneType]", "n_opt": "date"},
-        "datetime": {"opt": "Optional[datetime, NoneType]", "n_opt": "datetime"},
-        "dict": {"opt": "Optional[dict, NoneType]", "n_opt": "dict"},
-        "float": {"opt": "Optional[float, NoneType]", "n_opt": "float"},
-        "int": {"opt": "Optional[int, NoneType]", "n_opt": "int"},
-        "int_enum": {"opt": "Optional[Binary, NoneType]", "n_opt": "Binary"},
-        "list": {"opt": "Optional[List[int], NoneType]", "n_opt": "List[str]"},
-        "str": {"opt": "Optional[str, NoneType]", "n_opt": "str"},
-        "str_enum": {"opt": "Optional[Fruits, NoneType]", "n_opt": "Fruits"},
-        "time": {"opt": "Optional[time, NoneType]", "n_opt": "time"},
+        "bool": {"opt": f"{optional_as_str}[bool, NoneType]", "n_opt": "bool"},
+        "date": {"opt": f"{optional_as_str}[date, NoneType]", "n_opt": "date"},
+        "datetime": {"opt": f"{optional_as_str}[datetime, NoneType]", "n_opt": "datetime"},
+        "dict": {"opt": f"{optional_as_str}[dict, NoneType]", "n_opt": "dict"},
+        "float": {"opt": f"{optional_as_str}[float, NoneType]", "n_opt": "float"},
+        "int": {"opt": f"{optional_as_str}[int, NoneType]", "n_opt": "int"},
+        "int_enum": {"opt": f"{optional_as_str}[Binary, NoneType]", "n_opt": "Binary"},
+        "list": {"opt": f"{optional_as_str}[List[int], NoneType]", "n_opt": "List[str]"},
+        "str": {"opt": f"{optional_as_str}[str, NoneType]", "n_opt": "str"},
+        "str_enum": {"opt": f"{optional_as_str}[Fruits, NoneType]", "n_opt": "Fruits"},
+        "time": {"opt": f"{optional_as_str}[time, NoneType]", "n_opt": "time"},
         "union": {"opt": "Union[bool, int, NoneType]", "n_opt": "Union[bool, int]"}
     }
     route_unsupported_types = ["dict", "list"]