Refactor regex to pattern in param functions

vitalik · Nov 12, 2024 · 482516f · 482516f
1 parent 82d7bd6
commit 482516f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/ninja/params/__init__.py b/ninja/params/__init__.py
@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Pattern, TypeVar, Union
 
 from typing_extensions import Annotated
 
@@ -86,7 +86,7 @@ def P(
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -104,7 +104,7 @@ def P(
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,

diff --git a/ninja/params/functions.py b/ninja/params/functions.py
@@ -3,7 +3,7 @@
 # what it basically does makes function XXX that create instance of models.XXX
 # and annotates function with result = Any
 # idea from https://github.com/tiangolo/fastapi/blob/master/fastapi/param_functions.py
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Pattern, Union
 
 from ninja.params import models
 
@@ -20,7 +20,7 @@ def Path(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -38,7 +38,7 @@ def Path(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -59,7 +59,7 @@ def Query(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -77,7 +77,7 @@ def Query(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -98,7 +98,7 @@ def Header(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -116,7 +116,7 @@ def Header(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -137,7 +137,7 @@ def Cookie(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -155,7 +155,7 @@ def Cookie(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -176,7 +176,7 @@ def Body(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -194,7 +194,7 @@ def Body(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -215,7 +215,7 @@ def Form(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -233,7 +233,7 @@ def Form(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,
@@ -254,7 +254,7 @@ def File(  # noqa: N802
     le: Optional[float] = None,
     min_length: Optional[int] = None,
     max_length: Optional[int] = None,
-    regex: Optional[str] = None,
+    pattern: Union[str, Pattern[str], None] = None,
     example: Any = None,
     examples: Optional[Dict[str, Any]] = None,
     deprecated: Optional[bool] = None,
@@ -272,7 +272,7 @@ def File(  # noqa: N802
         le=le,
         min_length=min_length,
         max_length=max_length,
-        regex=regex,
+        pattern=pattern,
         example=example,
         examples=examples,
         deprecated=deprecated,