changes

requests3/__init__.py

@@ -154,7 +154,7 @@ from . import _types as types
 
 
 def request(
-    method: types.Method, url: types.URL, *, session: types.Session = None, **kwargs
+    method: types.Method, url: types.URL, *, session: types.HTTPSession = None, **kwargs
 ) -> types.Response:
     """Constructs and sends a :class:`Request <Request>`.
 
@@ -196,7 +196,7 @@ def request(
     # By using the 'with' statement we are sure the session is closed, thus we
     # avoid leaving sockets open which can trigger a ResourceWarning in some
     # cases, and look like a memory leak in others.
-    session = sessions.Session() if session is None else session
+    session = sessions.HTTPSession() if session is None else session
     with session:
         return session.request(method=method, url=url, **kwargs)
 

requests3/_types.py

@@ -65,4 +65,3 @@ Host = str
 Sequence = List
 Filename = str
 KeyValueList = List[Tuple[Text, Text]]
-Session = HTTPSession

setup.py

@@ -37,7 +37,8 @@ class PyTest(Command):
     def run(self):
         import pytest
 
-        errno = pytest.main(["-n", "auto"])
+        # errno = pytest.main(["-n", "auto"])
+        errno = pytest.main([])
         sys.exit(errno)
 
 

tests/test_requests.py

@@ -15,12 +15,12 @@ import io
 import requests
 import pytest
 import pytest_httpbin
-from requests3.adapters import HTTPAdapter
-from requests3.auth import HTTPDigestAuth, _basic_auth_str
-from requests3.basics import (
+from requests3._adapters import HTTPAdapter
+from requests3.http_auth import HTTPDigestAuth, _basic_auth_str
+from requests3._basics import (
     Morsel, cookielib, getproxies, str, urlparse, builtin_str
 )
-from requests3.cookies import ( cookiejar_from_dict, morsel_to_cookie)
+from requests3.http_cookies import ( cookiejar_from_dict, morsel_to_cookie)
 from requests3.exceptions import (
     ConnectionError,
     ConnectTimeout,
@@ -37,15 +37,15 @@ from requests3.exceptions import (
     InvalidBodyError,
     SSLError,
 )
-from requests3.models import PreparedRequest
-from requests3.structures import CaseInsensitiveDict
-from requests3.sessions import SessionRedirectMixin
-from requests3.models import urlencode
-from requests3.hooks import default_hooks
-from requests3.utils import DEFAULT_CA_BUNDLE_PATH
+from requests3.http_models import PreparedRequest
+from requests3.http_structures import CaseInsensitiveDict
+from requests3.http_sessions import SessionRedirectMixin
+from requests3.http_models import urlencode
+from requests3._hooks import default_hooks
+from requests3.http_utils import DEFAULT_CA_BUNDLE_PATH
 
 from .compat import StringIO, u
-from .utils import override_environ
+from .http_utils import override_environ
 from urllib3.util import Timeout as Urllib3Timeout