fixes3.0-requestscore

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>

3 files changed, 21 insertions, 21 deletions

diff --git a/requests3/adapters.py b/requests3/adapters.py
index 2d9cfa8c..ad183474 100644
--- a/requests3/adapters.py
+++ b/requests3/adapters.py
@@ -11,22 +11,22 @@ import os.path
 import socket
 
 from . import core
-from .core.http_manager._backends import TrioBackend
-from .core.http_manager.poolmanager import PoolManager, proxy_from_url
-from .core.http_manager._async.poolmanager import PoolManager as AsyncPoolManager
-from .core.http_manager.response import HTTPResponse
-from .core.http_manager.util import Timeout as TimeoutSauce
-from .core.http_manager.util.retry import Retry
-from .core.http_manager.exceptions import ClosedPoolError
-from .core.http_manager.exceptions import ConnectTimeoutError
-from .core.http_manager.exceptions import HTTPError as _HTTPError
-from .core.http_manager.exceptions import MaxRetryError
-from .core.http_manager.exceptions import NewConnectionError
-from .core.http_manager.exceptions import ProxyError as _ProxyError
-from .core.http_manager.exceptions import ProtocolError
-from .core.http_manager.exceptions import ReadTimeoutError
-from .core.http_manager.exceptions import SSLError as _SSLError
-from .core.http_manager.exceptions import ResponseError
+from .core._http._backends import TrioBackend
+from .core._http.poolmanager import PoolManager, proxy_from_url
+from .core._http._async.poolmanager import PoolManager as AsyncPoolManager
+from .core._http.response import HTTPResponse
+from .core._http.util import Timeout as TimeoutSauce
+from .core._http.util.retry import Retry
+from .core._http.exceptions import ClosedPoolError
+from .core._http.exceptions import ConnectTimeoutError
+from .core._http.exceptions import HTTPError as _HTTPError
+from .core._http.exceptions import MaxRetryError
+from .core._http.exceptions import NewConnectionError
+from .core._http.exceptions import ProxyError as _ProxyError
+from .core._http.exceptions import ProtocolError
+from .core._http.exceptions import ReadTimeoutError
+from .core._http.exceptions import SSLError as _SSLError
+from .core._http.exceptions import ResponseError
 
 from .models import Response, AsyncResponse
 from .basics import urlparse, basestring
@@ -52,7 +52,7 @@ from .exceptions import (
 from .auth import _basic_auth_str
 
 try:
-    from .core.http_manager.contrib.socks import SOCKSProxyManager
+    from .core._http.contrib.socks import SOCKSProxyManager
 except ImportError:
 
     def SOCKSProxyManager(*args, **kwargs):
diff --git a/requests3/models.py b/requests3/models.py
index a60d009e..65cda667 100644
--- a/requests3/models.py
+++ b/requests3/models.py
@@ -17,9 +17,9 @@ import sys
 import rfc3986
 import encodings.idna
 
-from .core.http_manager.fields import RequestField
-from .core.http_manager.filepost import encode_multipart_formdata
-from .core.http_manager.exceptions import (
+from .core._http.fields import RequestField
+from .core._http.filepost import encode_multipart_formdata
+from .core._http.exceptions import (
     DecodeError, ReadTimeoutError, ProtocolError, LocationParseError
 )
 
diff --git a/requests3/sessions.py b/requests3/sessions.py
index dae2218a..15d7b2cf 100644
--- a/requests3/sessions.py
+++ b/requests3/sessions.py
@@ -12,7 +12,7 @@ import time
 from collections import Mapping, OrderedDict
 from datetime import timedelta
 
-from .core.http_manager._backends.trio_backend import TrioBackend
+from .core._http._backends.trio_backend import TrioBackend
 
 from .auth import _basic_auth_str
 from .basics import cookielib, urljoin, urlparse, str