Add support for httpx as backend

README.rst

@@ -167,10 +167,11 @@ secret accessible via environment variables:
 ::
 
     $ pip install pip-tools
-    $ pip-compile requirements-dev.txt
+    $ pip-compile requirements-dev.in
     $ pip-sync requirements-dev.txt
     $ export AWS_ACCESS_KEY_ID=xxx
     $ export AWS_SECRET_ACCESS_KEY=xxx
+    $ export AWS_DEFAULT_REGION=xxx # e.g. us-west-2
 
 Execute tests suite:
 

aiobotocore/_endpoint_helpers.py

@@ -1,22 +1,22 @@
-import asyncio
+# import asyncio
 
-import aiohttp.http_exceptions
+# import aiohttp.http_exceptions
 import botocore.retryhandler
 import wrapt
 
 # Monkey patching: We need to insert the aiohttp exception equivalents
 # The only other way to do this would be to have another config file :(
-_aiohttp_retryable_exceptions = [
-    aiohttp.ClientConnectionError,
-    aiohttp.ClientPayloadError,
-    aiohttp.ServerDisconnectedError,
-    aiohttp.http_exceptions.HttpProcessingError,
-    asyncio.TimeoutError,
-]
-
-botocore.retryhandler.EXCEPTION_MAP['GENERAL_CONNECTION_ERROR'].extend(
-    _aiohttp_retryable_exceptions
-)
+# _aiohttp_retryable_exceptions = [
+#    aiohttp.ClientConnectionError,
+#    aiohttp.ClientPayloadError,
+#    aiohttp.ServerDisconnectedError,
+#    aiohttp.http_exceptions.HttpProcessingError,
+#    asyncio.TimeoutError,
+# ]
+#
+# botocore.retryhandler.EXCEPTION_MAP['GENERAL_CONNECTION_ERROR'].extend(
+#    _aiohttp_retryable_exceptions
+# )
 
 
 def _text(s, encoding='utf-8', errors='strict'):

aiobotocore/awsrequest.py

@@ -1,4 +1,5 @@
 import botocore.utils
+import httpx
 from botocore.awsrequest import AWSResponse
 
 
@@ -10,7 +11,10 @@ async def _content_prop(self):
 
         if self._content is None:
             # NOTE: this will cache the data in self.raw
-            self._content = await self.raw.read() or b''
+            if isinstance(self.raw, httpx.Response):
+                self._content = await self.raw.aread() or b''
+            else:
+                self._content = await self.raw.read() or b''
 
         return self._content
 

aiobotocore/endpoint.py

@@ -1,5 +1,7 @@
 import asyncio
+from typing import Any
 
+import httpx
 from botocore.endpoint import (
     DEFAULT_TIMEOUT,
     MAX_POOL_CONNECTIONS,
@@ -13,14 +15,19 @@
     logger,
 )
 from botocore.hooks import first_non_none_response
-from urllib3.response import HTTPHeaderDict
+from requests.models import Response
+from urllib3._collections import HTTPHeaderDict
 
 from aiobotocore.httpchecksum import handle_checksum_body
 from aiobotocore.httpsession import AIOHTTPSession
 from aiobotocore.response import StreamingBody
 
+# from botocore.awsrequest import AWSResponse
 
-async def convert_to_response_dict(http_response, operation_model):
+
+async def convert_to_response_dict(
+    http_response: Response, operation_model
+) -> dict[str, Any]:
     """Convert an HTTP response object to a request dict.
 
     This converts the requests library's HTTP response object to
@@ -36,15 +43,16 @@ async def convert_to_response_dict(http_response, operation_model):
         * body (string or file-like object)
 
     """
-    response_dict = {
+    http_response.raw: httpx.Response
+    response_dict: dict[str, Any] = {
         # botocore converts keys to str, so make sure that they are in
         # the expected case. See detailed discussion here:
         # https://github.com/aio-libs/aiobotocore/pull/116
         # aiohttp's CIMultiDict camel cases the headers :(
         'headers': HTTPHeaderDict(
             {
                 k.decode('utf-8').lower(): v.decode('utf-8')
-                for k, v in http_response.raw.raw_headers
+                for k, v in http_response.raw.headers.raw
             }
         ),
         'status_code': http_response.status_code,
@@ -181,11 +189,11 @@ async def _do_get_response(self, request, operation_model, context):
                 http_response = await self._send(request)
         except HTTPClientError as e:
             return (None, e)
-        except Exception as e:
-            logger.debug(
-                "Exception received when sending HTTP request.", exc_info=True
-            )
-            return (None, e)
+        # except Exception as e:
+        #    logger.debug(
+        #        "Exception received when sending HTTP request.", exc_info=True
+        #    )
+        #    return (None, e)
 
         # This returns the http_response and the parsed_data.
         response_dict = await convert_to_response_dict(