encode/httpx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support HTTPCore 0.13 (#1588)

Browse Source 
* Support HTTPCore 0.13

* Update httpcore minimum version

* Call into 'handle_async_request', not 'arequest'

* Drop unintentional commit

* Update tests
This commit is contained in:
Tom Christie 2021-04-21 14:43:18 +01:00 committed by GitHub
parent 2d571046e1
commit d98e9e7ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
httpx/_transports/default.py
View File

@ -78,19 +78,6 @@ def map_httpcore_exceptions() -> typing.Iterator[None]:
raise mapped_exc(message) from exc
def ensure_http_version_reason_phrase_as_bytes(extensions: dict) -> None:
# From HTTPX 0.18 onwards we're treating the "reason_phrase" and "http_version"
# extensions as bytes, in order to be more precise. Also we're using the
# "reason_phrase" key in preference to "reason", in order to match properly
# with the HTTP spec naming.
# HTTPCore 0.12 does not yet use these same conventions for the extensions,
# so we bridge between the two styles for now.
if "reason" in extensions:
extensions["reason_phrase"] = extensions.pop("reason").encode("ascii")
if "http_version" in extensions:
extensions["http_version"] = extensions["http_version"].encode("ascii")
HTTPCORE_EXC_MAP = {
httpcore.TimeoutException: TimeoutException,
httpcore.ConnectTimeout: ConnectTimeout,
@ -188,15 +175,14 @@ class HTTPTransport(BaseTransport):
int, typing.List[typing.Tuple[bytes, bytes]], SyncByteStream, dict
]:
with map_httpcore_exceptions():
status_code, headers, byte_stream, extensions = self._pool.request(
status_code, headers, byte_stream, extensions = self._pool.handle_request(
method=method,
url=url,
headers=headers,
stream=httpcore.IteratorByteStream(iter(stream)),
ext=extensions,
extensions=extensions,
)
ensure_http_version_reason_phrase_as_bytes(extensions)
stream = ResponseStream(byte_stream)
return status_code, headers, stream, extensions
@ -283,15 +269,19 @@ class AsyncHTTPTransport(AsyncBaseTransport):
int, typing.List[typing.Tuple[bytes, bytes]], AsyncByteStream, dict
]:
with map_httpcore_exceptions():
status_code, headers, byte_stream, extensions = await self._pool.arequest(
(
status_code,
headers,
byte_stream,
extensions,
) = await self._pool.handle_async_request(
method=method,
url=url,
headers=headers,
stream=httpcore.AsyncIteratorByteStream(stream.__aiter__()),
ext=extensions,
extensions=extensions,
)
ensure_http_version_reason_phrase_as_bytes(extensions)
stream = AsyncResponseStream(byte_stream)
return status_code, headers, stream, extensions

2
setup.py
View File

@ -59,7 +59,7 @@ setup(
"certifi",
"sniffio",
"rfc3986[idna2008]>=1.3,<2",
"httpcore>=0.12.1,<0.13",
"httpcore>=0.13.0,<0.14.0",
"async_generator; python_version < '3.7'"
],
extras_require={

8
tests/test_exceptions.py
View File

@ -46,19 +46,21 @@ def test_httpcore_exception_mapping(server) -> None:
def close(self):
raise httpcore.CloseError()
with mock.patch("httpcore.SyncConnectionPool.request", side_effect=connect_failed):
with mock.patch(
"httpcore.SyncConnectionPool.handle_request", side_effect=connect_failed
):
with pytest.raises(httpx.ConnectError):
httpx.get(server.url)
with mock.patch(
"httpcore.SyncConnectionPool.request",
"httpcore.SyncConnectionPool.handle_request",
return_value=(200, [], TimeoutStream(), {}),
):
with pytest.raises(httpx.ReadTimeout):
httpx.get(server.url)
with mock.patch(
"httpcore.SyncConnectionPool.request",
"httpcore.SyncConnectionPool.handle_request",
return_value=(200, [], CloseFailedStream(), {}),
):
with pytest.raises(httpx.CloseError):