From: Andrés Álvarez Date: Fri, 20 Dec 2019 16:53:42 +0000 (-0600) Subject: Rename `concurrency` directory to `backends` (#662) X-Git-Tag: 0.10.0~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34df7a7a19b5ebdbad59a0b7e1a54b4f011811b;p=thirdparty%2Fhttpx.git Rename `concurrency` directory to `backends` (#662) Closes #659 --- diff --git a/httpx/concurrency/__init__.py b/httpx/backends/__init__.py similarity index 100% rename from httpx/concurrency/__init__.py rename to httpx/backends/__init__.py diff --git a/httpx/concurrency/asyncio.py b/httpx/backends/asyncio.py similarity index 100% rename from httpx/concurrency/asyncio.py rename to httpx/backends/asyncio.py diff --git a/httpx/concurrency/auto.py b/httpx/backends/auto.py similarity index 100% rename from httpx/concurrency/auto.py rename to httpx/backends/auto.py diff --git a/httpx/concurrency/base.py b/httpx/backends/base.py similarity index 100% rename from httpx/concurrency/base.py rename to httpx/backends/base.py diff --git a/httpx/concurrency/trio.py b/httpx/backends/trio.py similarity index 100% rename from httpx/concurrency/trio.py rename to httpx/backends/trio.py diff --git a/httpx/client.py b/httpx/client.py index 75343b89..be9c881a 100644 --- a/httpx/client.py +++ b/httpx/client.py @@ -6,7 +6,7 @@ from types import TracebackType import hstspreload from .auth import Auth, AuthTypes, BasicAuth, FunctionAuth -from .concurrency.base import ConcurrencyBackend +from .backends.base import ConcurrencyBackend from .config import ( DEFAULT_MAX_REDIRECTS, DEFAULT_POOL_LIMITS, diff --git a/httpx/dispatch/connection.py b/httpx/dispatch/connection.py index 15ed455b..f61fc09b 100644 --- a/httpx/dispatch/connection.py +++ b/httpx/dispatch/connection.py @@ -4,7 +4,7 @@ import typing import h11 -from ..concurrency.base import BaseSocketStream, ConcurrencyBackend, lookup_backend +from ..backends.base import BaseSocketStream, ConcurrencyBackend, lookup_backend from ..config import CertTypes, SSLConfig, Timeout, VerifyTypes from ..models import URL, Origin, Request, Response from ..utils import get_logger diff --git a/httpx/dispatch/connection_pool.py b/httpx/dispatch/connection_pool.py index db576d22..d067949c 100644 --- a/httpx/dispatch/connection_pool.py +++ b/httpx/dispatch/connection_pool.py @@ -1,6 +1,6 @@ import typing -from ..concurrency.base import BaseSemaphore, ConcurrencyBackend, lookup_backend +from ..backends.base import BaseSemaphore, ConcurrencyBackend, lookup_backend from ..config import DEFAULT_POOL_LIMITS, CertTypes, PoolLimits, Timeout, VerifyTypes from ..exceptions import PoolTimeout from ..models import Origin, Request, Response diff --git a/httpx/dispatch/http11.py b/httpx/dispatch/http11.py index 384a8106..87a63698 100644 --- a/httpx/dispatch/http11.py +++ b/httpx/dispatch/http11.py @@ -2,7 +2,7 @@ import typing import h11 -from ..concurrency.base import BaseSocketStream +from ..backends.base import BaseSocketStream from ..config import Timeout from ..content_streams import AsyncIteratorStream from ..exceptions import ConnectionClosed, ProtocolError diff --git a/httpx/dispatch/http2.py b/httpx/dispatch/http2.py index 6748c591..adf74f5a 100644 --- a/httpx/dispatch/http2.py +++ b/httpx/dispatch/http2.py @@ -5,7 +5,7 @@ import h2.events from h2.config import H2Configuration from h2.settings import SettingCodes, Settings -from ..concurrency.base import ( +from ..backends.base import ( BaseEvent, BaseSocketStream, ConcurrencyBackend, diff --git a/httpx/dispatch/proxy_http.py b/httpx/dispatch/proxy_http.py index 4497f4fa..e2a5248e 100644 --- a/httpx/dispatch/proxy_http.py +++ b/httpx/dispatch/proxy_http.py @@ -3,7 +3,7 @@ import typing import warnings from base64 import b64encode -from ..concurrency.base import ConcurrencyBackend +from ..backends.base import ConcurrencyBackend from ..config import DEFAULT_POOL_LIMITS, CertTypes, PoolLimits, Timeout, VerifyTypes from ..exceptions import ProxyError from ..models import URL, Headers, HeaderTypes, Origin, Request, Response, URLTypes diff --git a/tests/concurrency.py b/tests/concurrency.py index 777ed5be..1d77df39 100644 --- a/tests/concurrency.py +++ b/tests/concurrency.py @@ -9,9 +9,9 @@ import typing import trio -from httpx.concurrency.asyncio import AsyncioBackend -from httpx.concurrency.auto import AutoBackend -from httpx.concurrency.trio import TrioBackend +from httpx.backends.asyncio import AsyncioBackend +from httpx.backends.auto import AutoBackend +from httpx.backends.trio import TrioBackend @functools.singledispatch diff --git a/tests/conftest.py b/tests/conftest.py index b27913ea..fc1d0f1b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,8 +18,8 @@ from uvicorn.config import Config from uvicorn.main import Server from httpx import URL -from httpx.concurrency.asyncio import AsyncioBackend -from httpx.concurrency.base import lookup_backend +from httpx.backends.asyncio import AsyncioBackend +from httpx.backends.base import lookup_backend ENVIRONMENT_VARIABLES = { "SSL_CERT_FILE", diff --git a/tests/dispatch/utils.py b/tests/dispatch/utils.py index d4cf6521..74fa311b 100644 --- a/tests/dispatch/utils.py +++ b/tests/dispatch/utils.py @@ -6,7 +6,7 @@ import h2.connection import h2.events from httpx import Request, Timeout -from httpx.concurrency.base import BaseSocketStream, lookup_backend +from httpx.backends.base import BaseSocketStream, lookup_backend from tests.concurrency import sleep diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py index a9b23dc3..cffc35bb 100644 --- a/tests/test_concurrency.py +++ b/tests/test_concurrency.py @@ -4,9 +4,9 @@ import pytest import trio from httpx import Timeout -from httpx.concurrency.asyncio import AsyncioBackend -from httpx.concurrency.base import lookup_backend -from httpx.concurrency.trio import TrioBackend +from httpx.backends.asyncio import AsyncioBackend +from httpx.backends.base import lookup_backend +from httpx.backends.trio import TrioBackend from httpx.config import SSLConfig from tests.concurrency import get_cipher, run_concurrently