Merge pull request bocadilloproject#60 from bocadilloproject/refactor…

…/wsgi Remove dependency on asgiref
horrormyth · Dec 15, 2018 · f05f468 · f05f468
2 parents 942a01e + 3330d43
commit f05f468
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Bocadillo adheres to [Semantic Versioning](https://semver.org).
 ### Removed
 
 - Removed example application.
+- Removed dependency on `asgiref` for WSGI sub-apps.
 
 ## [v0.7.0]
 

diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,6 @@ name = "pypi"
 starlette = "*"
 uvicorn = "*"
 parse = "*"
-asgiref = "*"
 "jinja2" = "*"
 whitenoise = "*"
 requests = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/bocadillo/api.py b/bocadillo/api.py
@@ -3,11 +3,11 @@
 from functools import partial
 from typing import Any, Dict, List, Optional, Tuple, Type, Union
 
-from asgiref.wsgi import WsgiToAsgi
 from starlette.middleware.cors import CORSMiddleware
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.middleware.httpsredirect import HTTPSRedirectMiddleware
 from starlette.middleware.trustedhost import TrustedHostMiddleware
+from starlette.middleware.wsgi import WSGIResponder
 from starlette.testclient import TestClient
 from uvicorn.main import get_logger, run
 from uvicorn.reloaders.statreload import StatReload
@@ -350,8 +350,7 @@ def find_app(self, scope: dict) -> ASGIAppInstance:
             try:
                 return app(scope)
             except TypeError:
-                app = WsgiToAsgi(app)
-                return app(scope)
+                return WSGIResponder(app, scope)
 
         def app(s: dict):
             async def asgi(receive, send):

diff --git a/setup.py b/setup.py
@@ -21,7 +21,6 @@
         "starlette",
         "uvicorn",
         "jinja2",
-        "asgiref",
         "whitenoise",
         "requests",
         "parse",