Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Postpone request decoding #91

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Postpone request decoding #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions respx/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,18 @@ def encode_response(self, content: ContentDataTypes) -> Response:
def raw(self):
content = self._content
if callable(content):
content = content(**self.context)
kwargs = dict(self.context)
request = decode_request(kwargs.pop("request"))
content = content(request, **kwargs)

return self.encode_response(content)

@property
async def araw(self):
if callable(self._content) and inspect.iscoroutinefunction(self._content):
content = await self._content(**self.context)
kwargs = dict(self.context)
request = decode_request(kwargs.pop("request"))
content = await self._content(request, **kwargs)
return self.encode_response(content)

return self.raw
Expand Down Expand Up @@ -363,13 +367,13 @@ def match(self, request: Request) -> Optional[Union[Request, ResponseTemplate]]:
"""
matches = False
url_params: Kwargs = {}
_request = decode_request(request)

if self.pass_through:
return request

if self._match_func:
response = self.response.clone(context={"request": _request})
_request = decode_request(request)
response = self.response.clone(context={"request": request})
result = self._match_func(_request, response)
if result == _request: # Detect pass through
result = request
Expand All @@ -390,6 +394,6 @@ def match(self, request: Request) -> Optional[Union[Request, ResponseTemplate]]:
url_params = match.groupdict()

if matches:
return self.response.clone(context={"request": _request, **url_params})
return self.response.clone(context={"request": request, **url_params})

return None