From: Tom Christie <tom@tomchristie.com>
Date: Mon, 29 Apr 2019 15:58:00 +0000 (+0100)
Subject: Merge branch 'master' into decoding-exceptions
X-Git-Tag: 0.3.0~65^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ae3e1e966b106376098da517946a63b590e97f;p=thirdparty%2Fhttpx.git

Merge branch 'master' into decoding-exceptions
---

51ae3e1e966b106376098da517946a63b590e97f
diff --cc httpcore/__init__.py
index a6e4db97,813b2b56..1aa20f65
--- a/httpcore/__init__.py
+++ b/httpcore/__init__.py
@@@ -1,8 -1,12 +1,13 @@@
+ from .adapters.redirects import RedirectAdapter
+ from .client import Client
  from .config import PoolLimits, SSLConfig, TimeoutConfig
- from .connectionpool import ConnectionPool
- from .datastructures import URL, Origin, Request, Response
+ from .dispatch.connection import HTTPConnection
+ from .dispatch.connection_pool import ConnectionPool
+ from .dispatch.http2 import HTTP2Connection
+ from .dispatch.http11 import HTTP11Connection
  from .exceptions import (
      ConnectTimeout,
++    DecodingError,
      PoolTimeout,
      ProtocolError,
      ReadTimeout,
diff --cc httpcore/exceptions.py
index 9756a54f,cf8d3f18..e8c8b72e
--- a/httpcore/exceptions.py
+++ b/httpcore/exceptions.py
@@@ -42,7 -73,6 +73,13 @@@ class ResponseClosed(Exception)
      """
  
  
 +class DecodingError(Exception):
 +    """
 +    Decoding of the response failed.
 +    """
++
++    
+ class InvalidURL(Exception):
+     """
++    URL was missing a hostname, or was not one of HTTP/HTTPS.
+     """