Add support for httpx.Response(content=..., text=..., html=..., json=...)
#1250
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tomchristie
commented
Sep 2, 2020
| @@ -95,21 +92,14 @@ def __iter__(self) -> typing.Iterator[bytes]: | |||
| def __aiter__(self) -> typing.AsyncIterator[bytes]: | |||
| raise RuntimeError("Attempted to call a async iterator on an sync stream.") | |||
|
|
|||
| def close(self) -> None: | |||
| if self.close_func is not None: | |||
| self.close_func() | |||
There was a problem hiding this comment.
Turns out we don't really need close_func on IteratorStream/AsyncIteratorStream anymore, which falls out from updating test cases to use Response(content=<bytes iterator>)
tomchristie
commented
Sep 2, 2020
| raise httpcore.NetworkError(exc) from exc | ||
|
|
||
| def close(self) -> None: | ||
| self._conn.release_conn() |
There was a problem hiding this comment.
Changes in this module are redundant given #1182, but I've updated this all the same since this PR removes close_func from our internal IteratorStream.
j178
force-pushed
the
content-parameters-on-response
branch
from
0744e4d to
266bfa1
Compare
tomchristie
changed the title
httpx.Response(content=..., text=..., html=..., json=...)
|
If we need to narrow down the scope of this for review purposes, I'd be happy to think about how best to do that. |
|
Putting this in draft to instead tackle the intent here in a more targeted manner. |
Merged
|
Closing in favour of #1297 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1227
Adds support for eg...
httpx.Response(200, content=b'Hello, world')httpx.Response(200, text='Hello, world')httpx.Response(200, html='Hello, world')httpx.Response(200, json={'Hello': 'world'})Plus streaming cases...
httpx.Response(200, content=<byte iterator>)httpx.Response(200, content=<byte aiterator>)There are some test cases we'd be able to smarten up after this, but I'll leave that for a follow up.