Turn concurrency.py into its own sub-package (#244)

diff --git a/httpx/__init__.py b/httpx/__init__.py
index dec5cff19c749bf77a819e28ae86856234d50dcf..c2925d5c81fedfc9962623e81c7f2335eacbc7b4 100644 (file)
--- a/httpx/__init__.py
+++ b/httpx/__init__.py
@@ -1,7 +1,7 @@
 from .__version__ import __description__, __title__, __version__
 from .api import delete, get, head, options, patch, post, put, request
 from .client import AsyncClient, Client
-from .concurrency import AsyncioBackend
+from .concurrency.asyncio import AsyncioBackend
 from .config import (
     USER_AGENT,
     CertTypes,

diff --git a/httpx/client.py b/httpx/client.py
index fd86fb0c8385e21bc09802faaf06564371494668..ae75f15da8b061512fec00985b6cc89c91351524 100644 (file)
--- a/httpx/client.py
+++ b/httpx/client.py
@@ -5,7 +5,7 @@ from types import TracebackType
 import hstspreload
 
 from .auth import HTTPBasicAuth
-from .concurrency import AsyncioBackend
+from .concurrency.asyncio import AsyncioBackend
 from .config import (
     DEFAULT_MAX_REDIRECTS,
     DEFAULT_POOL_LIMITS,

diff --git a/httpx/concurrency/__init__.py b/httpx/concurrency/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/httpx/concurrency.py b/httpx/concurrency/asyncio.py
similarity index 98%
rename from httpx/concurrency.py
rename to httpx/concurrency/asyncio.py
index f1bf585448f27d2b3b3f8941d70b051e0585a5ad..6c5dc0c481284d8e80a57a3822620c19fca68129 100644 (file)
--- a/httpx/concurrency.py
+++ b/httpx/concurrency/asyncio.py
@@ -14,9 +14,9 @@ import ssl
 import typing
 from types import TracebackType
 
-from .config import PoolLimits, TimeoutConfig
-from .exceptions import ConnectTimeout, PoolTimeout, ReadTimeout, WriteTimeout
-from .interfaces import (
+from ..config import PoolLimits, TimeoutConfig
+from ..exceptions import ConnectTimeout, PoolTimeout, ReadTimeout, WriteTimeout
+from ..interfaces import (
     BaseBackgroundManager,
     BasePoolSemaphore,
     BaseReader,

diff --git a/httpx/dispatch/connection.py b/httpx/dispatch/connection.py
index b51fec688b57ab78133d595d3c5f350706b65b08..9dda06d0317831591880dea1d112304c42cdb452 100644 (file)
--- a/httpx/dispatch/connection.py
+++ b/httpx/dispatch/connection.py
@@ -1,7 +1,7 @@
 import functools
 import typing
 
-from ..concurrency import AsyncioBackend
+from ..concurrency.asyncio import AsyncioBackend
 from ..config import (
     DEFAULT_TIMEOUT_CONFIG,
     CertTypes,

diff --git a/httpx/dispatch/connection_pool.py b/httpx/dispatch/connection_pool.py
index 3090a9a514dddca61b247c66a148f859bfd5acdf..33dbd19e2f0188d3d4fee3058b7066402d8d3433 100644 (file)
--- a/httpx/dispatch/connection_pool.py
+++ b/httpx/dispatch/connection_pool.py
@@ -1,6 +1,6 @@
 import typing
 
-from ..concurrency import AsyncioBackend
+from ..concurrency.asyncio import AsyncioBackend
 from ..config import (
     DEFAULT_POOL_LIMITS,
     DEFAULT_TIMEOUT_CONFIG,

diff --git a/httpx/dispatch/http11.py b/httpx/dispatch/http11.py
index 623ac1df6bfbc8affee3768dc753951fd962667e..eff419a1cba7cc84652c477ef209359bd0e4760e 100644 (file)
--- a/httpx/dispatch/http11.py
+++ b/httpx/dispatch/http11.py
@@ -2,7 +2,7 @@ import typing
 
 import h11
 
-from ..concurrency import TimeoutFlag
+from ..concurrency.asyncio import TimeoutFlag
 from ..config import TimeoutConfig, TimeoutTypes
 from ..interfaces import BaseReader, BaseWriter, ConcurrencyBackend
 from ..models import AsyncRequest, AsyncResponse

diff --git a/httpx/dispatch/http2.py b/httpx/dispatch/http2.py
index 980b07b25cc83d674c3b0fe34b08c30962860efe..f932598236b149e59be2a3d0904a138f499d0f3c 100644 (file)
--- a/httpx/dispatch/http2.py
+++ b/httpx/dispatch/http2.py
@@ -4,7 +4,7 @@ import typing
 import h2.connection
 import h2.events
 
-from ..concurrency import TimeoutFlag
+from ..concurrency.asyncio import TimeoutFlag
 from ..config import TimeoutConfig, TimeoutTypes
 from ..interfaces import BaseReader, BaseWriter, ConcurrencyBackend
 from ..models import AsyncRequest, AsyncResponse