diff --git a/requests_async/adapters.py b/requests_async/adapters.py index 2ffce11..d7940cb 100644 --- a/requests_async/adapters.py +++ b/requests_async/adapters.py @@ -1,16 +1,18 @@ import asyncio import io import os +import socket import ssl import typing from http.client import _encode from urllib.parse import urlparse import h11 -import httpcore import requests import urllib3 +import httpcore + from .cookies import extract_cookies_to_jar from .exceptions import ConnectionError, ConnectTimeout, ReadTimeout from .models import Response @@ -53,7 +55,7 @@ async def send( ssl=ssl, timeout=timeout, ) - except (httpcore.BadResponse, socket.error) as err: + except socket.error as err: raise ConnectionError(err, request=request) except httpcore.ConnectTimeout as err: raise ConnectTimeout(err, request=request) diff --git a/requests_async/asgi.py b/requests_async/asgi.py index 88dd193..9795368 100644 --- a/requests_async/asgi.py +++ b/requests_async/asgi.py @@ -9,9 +9,10 @@ import typing from urllib.parse import unquote, urljoin, urlsplit -import httpcore import requests +import httpcore + from .adapters import HTTPAdapter from .sessions import Session diff --git a/requirements.txt b/requirements.txt index 2a25e51..78b69a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -httpcore==0.1.* -requests +httpcore==0.2.* +requests==2.* # Testing black diff --git a/setup.py b/setup.py index 19c2ed2..2f21152 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ def get_packages(package): author_email="tom@tomchristie.com", packages=get_packages("requests_async"), data_files=[("", ["LICENSE.md"])], - install_requires=["requests", "httpcore==0.1.*"], + install_requires=["requests==2.*", "httpcore==0.2.*"], classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment",