Merge pull request #72 from paulineribeyre/master

fix(pop): expose pop in api

respx/__init__.py

@@ -11,6 +11,7 @@
     stop,
     clear,
     reset,
+    pop,
     add,
     request,
     get,
@@ -36,6 +37,7 @@
     "stop",
     "clear",
     "reset",
+    "pop",
     "add",
     "request",
     "get",

respx/api.py

@@ -1,7 +1,7 @@
-from typing import Callable, Optional, Pattern, Union
+from typing import Callable, Optional, Pattern, Union, overload
 
 from .mocks import MockTransport
-from .models import ContentDataTypes, HeaderTypes, RequestPattern
+from .models import ContentDataTypes, DefaultType, HeaderTypes, RequestPattern
 
 mock = MockTransport(assert_all_called=False)
 
@@ -30,6 +30,21 @@ def reset() -> None:
     mock.reset()
 
 
+@overload
+def pop(alias: str) -> RequestPattern:
+    ...
+
+
+@overload
+def pop(alias: str, default: DefaultType) -> Union[RequestPattern, DefaultType]:
+    ...
+
+
+def pop(alias, default=...):
+    global mock
+    return mock.pop(alias=alias, default=default)
+
+
 def add(
     method: Union[str, Callable],
     url: Optional[Union[str, Pattern]] = None,

respx/models.py

@@ -13,6 +13,7 @@
     Pattern,
     Sequence,
     Tuple,
+    TypeVar,
     Union,
 )
 from unittest import mock
@@ -47,6 +48,8 @@
     Sequence[Tuple[bytes, bytes]],
 ]
 
+DefaultType = TypeVar("DefaultType", bound=Any)
+
 Regex = type(re.compile(""))
 Kwargs = Dict[str, Any]
 URLPatternTypes = Union[str, Pattern[str], URL]

respx/transports.py

@@ -8,7 +8,6 @@
     Optional,
     Pattern,
     Tuple,
-    TypeVar,
     Union,
     overload,
 )
@@ -24,6 +23,7 @@
 from .models import (
     URL,
     ContentDataTypes,
+    DefaultType,
     Headers,
     HeaderTypes,
     Request,
@@ -35,8 +35,6 @@
     build_response,
 )
 
-DefaultType = TypeVar("DefaultType", bound=Any)
-
 
 class BaseMockTransport:
     def __init__(