Unasync'ed base dispatchers

.gitignore

@@ -8,3 +8,4 @@ site/
 *.egg-info/
 venv*/
 .python-version
+_sync/

.travis.yml

@@ -22,9 +22,11 @@ matrix:
     -
       stage: check
       python: 3.7
+      before_script: scripts/compile
       script: scripts/check
     - stage: docs
       python: 3.7
+      before_script: scripts/compile
       script: scripts/docs-build
     - stage: test
       os: windows
@@ -36,6 +38,7 @@ matrix:
         - choco install python --version 3.7
         - python -m pip install --upgrade pip
       install: pip install -r requirements.txt
+      before_script: scripts/compile
       script: scripts/test
 
   fast_finish: true
@@ -44,6 +47,8 @@ matrix:
     # Some tests not yet resolved for Windows. (In progress)
     - os: windows
 
+before_script: scripts/compile
+
 script: scripts/test
 
 after_script:

httpx/_async/dispatch/base.py

@@ -0,0 +1,52 @@
+import types
+import typing
+
+from ...config import Timeout
+from ...models import (
+    HeaderTypes,
+    QueryParamTypes,
+    Request,
+    RequestData,
+    Response,
+    URLTypes,
+)
+
+
+class AsyncDispatcher:
+    """
+    Base class for dispatcher classes, that handle sending the request.
+
+    Stubs out the interface, as well as providing a `.request()` convenience
+    implementation, to make it easy to use or test stand-alone dispatchers,
+    without requiring a complete client instance.
+    """
+
+    async def request(
+        self,
+        method: str,
+        url: URLTypes,
+        *,
+        data: RequestData = b"",
+        params: QueryParamTypes = None,
+        headers: HeaderTypes = None,
+        timeout: Timeout = None,
+    ) -> Response:
+        request = Request(method, url, data=data, params=params, headers=headers)
+        return await self.send(request, timeout=timeout)
+
+    async def send(self, request: Request, timeout: Timeout = None) -> Response:
+        raise NotImplementedError()  # pragma: nocover
+
+    async def close(self) -> None:
+        pass  # pragma: nocover
+
+    async def __aenter__(self) -> "AsyncDispatcher":
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: typing.Type[BaseException] = None,
+        exc_value: BaseException = None,
+        traceback: types.TracebackType = None,
+    ) -> None:
+        await self.close()

httpx/dispatch/base.py

@@ -1,64 +1,4 @@
-import typing
-from types import TracebackType
+from .._async.dispatch.base import AsyncDispatcher
+from .._sync.dispatch.base import SyncDispatcher
 
-from ..config import Timeout
-from ..models import (
-    HeaderTypes,
-    QueryParamTypes,
-    Request,
-    RequestData,
-    Response,
-    URLTypes,
-)
-
-
-class SyncDispatcher:
-    """
-    Base class for Dispatcher classes, that handle sending the request.
-    """
-
-    def send(self, request: Request, timeout: Timeout = None) -> Response:
-        raise NotImplementedError()  # pragma: nocover
-
-    def close(self) -> None:
-        pass  # pragma: nocover
-
-
-class AsyncDispatcher:
-    """
-    Base class for AsyncDispatcher classes, that handle sending the request.
-
-    Stubs out the interface, as well as providing a `.request()` convenience
-    implementation, to make it easy to use or test stand-alone AsyncDispatchers,
-    without requiring a complete `AsyncClient` instance.
-    """
-
-    async def request(
-        self,
-        method: str,
-        url: URLTypes,
-        *,
-        data: RequestData = b"",
-        params: QueryParamTypes = None,
-        headers: HeaderTypes = None,
-        timeout: Timeout = None,
-    ) -> Response:
-        request = Request(method, url, data=data, params=params, headers=headers)
-        return await self.send(request, timeout=timeout)
-
-    async def send(self, request: Request, timeout: Timeout = None) -> Response:
-        raise NotImplementedError()  # pragma: nocover
-
-    async def close(self) -> None:
-        pass  # pragma: nocover
-
-    async def __aenter__(self) -> "AsyncDispatcher":
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: typing.Type[BaseException] = None,
-        exc_value: BaseException = None,
-        traceback: TracebackType = None,
-    ) -> None:
-        await self.close()
+__all__ = ["AsyncDispatcher", "SyncDispatcher"]

pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=40.6.2",
+    "wheel",
+    "unasync==0.4.*",
+]
+build-backend = "setuptools.build_meta"

requirements.txt

@@ -21,7 +21,9 @@ pytest-trio
 pytest-cov
 trio
 trustme
+unasync==0.4.*
 uvicorn
 seed-isort-config
+wheel
 
 attrs>=19.2  # See: https://github.com/encode/httpx/pull/566#issuecomment-559862665

scripts/clean

@@ -3,6 +3,9 @@
 if [ -d 'dist' ] ; then
     rm -r dist
 fi
+if [ -d 'build' ] ; then
+    rm -r build
+fi
 if [ -d 'site' ] ; then
     rm -r site
 fi

scripts/compile

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+export PREFIX=""
+if [ -d "venv" ]; then
+  export PREFIX="venv/bin/"
+fi
+
+set -x
+
+scripts/clean
+
+${PREFIX}python setup.py bdist_wheel
+rm -rf httpx/_sync
+mv build/lib/httpx/_sync httpx
+
+scripts/clean

scripts/publish

@@ -15,12 +15,6 @@ if ! command -v "${PREFIX}twine" &>/dev/null ; then
     exit 1
 fi
 
-if ! ${PREFIX}pip show wheel &>/dev/null ; then
-    echo "Unable to find the 'wheel' command."
-    echo "Install from PyPI, using '${PREFIX}pip install wheel'."
-    exit 1
-fi
-
 if ! command -v "${PREFIX}mkdocs" &>/dev/null ; then
     echo "Unable to find the 'mkdocs' command."
     echo "Install from PyPI, using '${PREFIX}pip install mkdocs'."

setup.py

@@ -4,6 +4,7 @@
 import re
 from pathlib import Path
 
+import unasync
 from setuptools import setup
 
 
@@ -61,6 +62,7 @@ def get_packages(package):
         "sniffio==1.*",
         "urllib3==1.*",
     ],
+    cmdclass={"build_py": unasync.build_py},
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",