feat: avoid mypy cheat and tests

Author: skokado

ninja/params/__init__.py

@@ -43,7 +43,6 @@ def __getitem__(self, args: Any) -> Any:
     Cookie = Annotated[T, param_functions.Cookie()]
     File = Annotated[T, param_functions.File()]
     Form = Annotated[T, param_functions.Form()]
-    Header = Annotated[T, param_functions.Header()]
     Path = Annotated[T, param_functions.Path()]
     Query = Annotated[T, param_functions.Query()]
     # mypy does not like to extend already annotated params
@@ -52,15 +51,13 @@ def __getitem__(self, args: Any) -> Any:
     from typing_extensions import Annotated as CookieEx
     from typing_extensions import Annotated as FileEx
     from typing_extensions import Annotated as FormEx
-    from typing_extensions import Annotated as HeaderEx
     from typing_extensions import Annotated as PathEx
     from typing_extensions import Annotated as QueryEx
 else:
     Body = ParamShortcut(param_functions.Body)
     Cookie = ParamShortcut(param_functions.Cookie)
     File = ParamShortcut(param_functions.File)
     Form = ParamShortcut(param_functions.Form)
-    Header = ParamShortcut(param_functions.Header)
     Path = ParamShortcut(param_functions.Path)
     Query = ParamShortcut(param_functions.Query)
     # mypy does not like to extend already annotated params
@@ -69,11 +66,14 @@ def __getitem__(self, args: Any) -> Any:
     CookieEx = Cookie
     FileEx = File
     FormEx = Form
-    HeaderEx = Header
     PathEx = Path
     QueryEx = Query
 
 
+Header = ParamShortcut(param_functions.Header)
+HeaderEx = Header
+
+
 def P(
     *,
     alias: Optional[str] = None,

tests/test_request.py

@@ -1,3 +1,4 @@
+import sys
 from typing import Optional
 
 import pytest
@@ -26,6 +27,16 @@ def headers1(request, user_agent: str = Header(...)):
     return user_agent
 
 
+annotated_available = sys.version_info >= (3, 9)
+
+if annotated_available:
+    from typing import Annotated
+
+    @router.get("/headers1_annotated")
+    def headers1_annotated(request, user_agent: Annotated[str, Header(...)]):
+        return user_agent
+
+
 @router.get("/headers2")
 def headers2(request, ua: str = Header(..., alias="User-Agent")):
     return ua
@@ -68,6 +79,7 @@ def schema(request, payload: ExtraForbidSchema = Body(...)):
     "path,expected_status,expected_response",
     [
         ("/headers1", 200, "Ninja"),
+        *([("/headers1_annotated", 200, "Ninja")] if annotated_available else []),
         ("/headers2", 200, "Ninja"),
         ("/headers3", 200, 10),
         ("/headers4", 200, 10),