From: Tom Christie <tom@tomchristie.com>
Date: Tue, 20 Aug 2019 12:08:24 +0000 (+0100)
Subject: Merge branch 'master' into protocol-support
X-Git-Tag: 0.7.2~19^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193196bef33903b659345920bbe2621f4940c8e0;p=thirdparty%2Fhttpx.git

Merge branch 'master' into protocol-support
---

193196bef33903b659345920bbe2621f4940c8e0
diff --cc httpx/concurrency/asyncio.py
index a87c9a1d,6c5dc0c4..613d48f9
--- a/httpx/concurrency/asyncio.py
+++ b/httpx/concurrency/asyncio.py
@@@ -14,9 -14,9 +14,9 @@@ import ss
  import typing
  from types import TracebackType
  
- from .config import PoolLimits, HTTPVersionConfig, TimeoutConfig
- from .exceptions import ConnectTimeout, PoolTimeout, ReadTimeout, WriteTimeout
- from .interfaces import (
 -from ..config import PoolLimits, TimeoutConfig
++from ..config import PoolLimits, HTTPVersionConfig, TimeoutConfig
+ from ..exceptions import ConnectTimeout, PoolTimeout, ReadTimeout, WriteTimeout
+ from ..interfaces import (
      BaseBackgroundManager,
      BasePoolSemaphore,
      BaseReader,
diff --cc httpx/dispatch/connection.py
index 230afc06,9dda06d0..a0d124fc
--- a/httpx/dispatch/connection.py
+++ b/httpx/dispatch/connection.py
@@@ -1,8 -1,7 +1,8 @@@
  import functools
  import typing
 +import ssl
  
- from ..concurrency import AsyncioBackend
+ from ..concurrency.asyncio import AsyncioBackend
  from ..config import (
      DEFAULT_TIMEOUT_CONFIG,
      CertTypes,