Merge pull request #105 from lundberg/drop-deprecations

Drop deprecated API's and models
lundberg · Nov 12, 2020 · d7597a9 · d7597a9
2 parents a562bc5 + 9870643
commit d7597a9
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 1,064 deletions.
diff --git a/respx/__init__.py b/respx/__init__.py
@@ -2,13 +2,10 @@
 from .mocks import MockTransport
 from .models import MockResponse, Route
 from .router import Router
-from .transports import AsyncMockTransport, SyncMockTransport
 
 from .api import (  # isort:skip
     mock,
     routes,
-    aliases,
-    stats,
     calls,
     start,
     stop,
@@ -29,15 +26,11 @@
 __all__ = [
     "__version__",
     "MockTransport",
-    "AsyncMockTransport",
-    "SyncMockTransport",
+    "MockResponse",
     "Router",
     "Route",
-    "MockResponse",
     "mock",
     "routes",
-    "aliases",
-    "stats",
     "calls",
     "start",
     "stop",

diff --git a/respx/api.py b/respx/api.py
@@ -1,22 +1,13 @@
-from typing import Any, Callable, Optional, Union, overload
+from typing import Any, Optional, Union, overload
 
 from .mocks import MockTransport
 from .models import CallList, Route
 from .patterns import Pattern
-from .types import (
-    ContentDataTypes,
-    DefaultType,
-    HeaderTypes,
-    JSONTypes,
-    QueryParamTypes,
-    URLPatternTypes,
-)
+from .types import DefaultType, URLPatternTypes
 
 mock = MockTransport(assert_all_called=False)
 
-aliases = mock.routes
 routes = mock.routes
-stats = mock.calls
 calls: CallList = mock.calls
 
 
@@ -60,275 +51,55 @@ def route(*patterns: Pattern, name: Optional[str] = None, **lookups: Any) -> Rou
     return mock.route(*patterns, name=name, **lookups)
 
 
-def add(
-    method: Union[str, Callable, Route],
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
-) -> Route:
+def add(route: Route, *, name: Optional[str] = None) -> Route:
     global mock
-    return mock.add(
-        method,
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.add(route, name=name)
 
 
 def get(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.get(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.get(url, name=name, **lookups)
 
 
 def post(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.post(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.post(url, name=name, **lookups)
 
 
 def put(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.put(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.put(url, name=name, **lookups)
 
 
 def patch(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.patch(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.patch(url, name=name, **lookups)
 
 
 def delete(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.delete(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.delete(url, name=name, **lookups)
 
 
 def head(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.head(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.head(url, name=name, **lookups)
 
 
 def options(
-    url: Optional[URLPatternTypes] = None,
-    *,
-    params: Optional[QueryParamTypes] = None,
-    status_code: Optional[int] = None,
-    headers: Optional[HeaderTypes] = None,
-    content_type: Optional[str] = None,
-    content: Optional[ContentDataTypes] = None,
-    text: Optional[str] = None,
-    html: Optional[str] = None,
-    json: Optional[JSONTypes] = None,
-    pass_through: bool = False,
-    alias: Optional[str] = None,
-    name: Optional[str] = None,
-    **lookups: Any,
+    url: Optional[URLPatternTypes] = None, *, name: Optional[str] = None, **lookups: Any
 ) -> Route:
     global mock
-    return mock.options(
-        url=url,
-        params=params,
-        status_code=status_code,
-        headers=headers,
-        content_type=content_type,
-        content=content,
-        text=text,
-        html=html,
-        json=json,
-        pass_through=pass_through,
-        alias=alias,
-        name=name,
-        **lookups,
-    )
+    return mock.options(url, name=name, **lookups)
diff --git a/respx/mocks.py b/respx/mocks.py
@@ -1,14 +1,15 @@
 import inspect
 from functools import partial, wraps
-from typing import Any, Callable, Dict, List, Optional, Union
+from types import TracebackType
+from typing import Any, Callable, Dict, List, Optional, Type, Union
 from unittest import mock
 
-from .transports import BaseMockTransport
+from .transports import RouterTransport
 
 __all__ = ["MockTransport"]
 
 
-class MockTransport(BaseMockTransport):
+class MockTransport(RouterTransport):
     _local = False
     _patches: List[mock._patch] = []
     transports: List["MockTransport"] = []
@@ -79,8 +80,13 @@ def __enter__(self) -> "MockTransport":
         self.start()
         return self
 
-    def __exit__(self, exception_type: Optional[Exception], *args: Any) -> None:
-        self.stop(quiet=bool(exception_type is not None))
+    def __exit__(
+        self,
+        exc_type: Type[BaseException] = None,
+        exc_value: BaseException = None,
+        traceback: TracebackType = None,
+    ) -> None:
+        self.stop(quiet=bool(exc_type is not None))
 
     async def __aenter__(self) -> "MockTransport":
         return self.__enter__()
@@ -106,8 +112,8 @@ def stop(self, clear: bool = True, reset: bool = True, quiet: bool = False) -> N
         started = bool(self in self.transports)
 
         try:
-            if started and not quiet and self._assert_all_called:
-                self.assert_all_called()
+            if started and not quiet:
+                self.close()
         finally:
             # Idempotent check, i.e. already started
             if started: