-
-
Notifications
You must be signed in to change notification settings - Fork 856
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.
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
Add support for httpx.Response(content=..., text=..., html=..., json=...)
#1250
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
406c0dc
encode -> encode_request_body
tomchristie 786258d
Use encode_response_body for Response(content=...) case
tomchristie bd14386
Auto set appropriate response headers
tomchristie f457af0
Add support for json=...
tomchristie b34da18
Add text/plain and text/html responses
tomchristie d03b972
Support Response(content=<byte iterator>)
tomchristie 76d3604
Drop unneeded close_func from iterator content streams
tomchristie 8e7b8d1
Use Response(content=...) where possible
tomchristie 266bfa1
Merge branch 'master' into content-parameters-on-response
j178 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
import httpcore | ||
|
||
from .._config import create_ssl_context | ||
from .._content_streams import ByteStream, IteratorStream | ||
from .._content_streams import ByteStream | ||
from .._exceptions import NetworkError, map_exceptions | ||
from .._types import CertTypes, VerifyTypes | ||
|
||
|
@@ -15,6 +15,21 @@ | |
urllib3 = None | ||
|
||
|
||
class URLLib3ByteStream(httpcore.SyncByteStream): | ||
def __init__(self, conn: urllib3.HTTPResponse) -> None: | ||
self._conn = conn | ||
|
||
def __iter__(self) -> Iterator[bytes]: | ||
try: | ||
for chunk in self._conn.stream(4096, decode_content=False): | ||
yield chunk | ||
except socket.error as exc: | ||
raise httpcore.NetworkError(exc) from exc | ||
|
||
def close(self) -> None: | ||
self._conn.release_conn() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Changes in this module are redundant given #1182, but I've updated this all the same since this PR removes |
||
|
||
|
||
class URLLib3Transport(httpcore.SyncHTTPTransport): | ||
def __init__( | ||
self, | ||
|
@@ -104,16 +119,9 @@ def request( | |
pool_timeout=timeout.get("pool"), | ||
) | ||
|
||
def response_bytes() -> Iterator[bytes]: | ||
with map_exceptions({socket.error: NetworkError}): | ||
for chunk in conn.stream(4096, decode_content=False): | ||
yield chunk | ||
|
||
status_code = conn.status | ||
headers = list(conn.headers.items()) | ||
response_stream = IteratorStream( | ||
iterator=response_bytes(), close_func=conn.release_conn | ||
) | ||
response_stream = URLLib3ByteStream(conn=conn) | ||
return (b"HTTP/1.1", status_code, conn.reason, headers, response_stream) | ||
|
||
def close(self) -> None: | ||
|
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Turns out we don't really need
close_func
onIteratorStream
/AsyncIteratorStream
anymore, which falls out from updating test cases to useResponse(content=<bytes iterator>)