Add 3.11-dev support

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: [3.8, 3.9, "3.10", 3.11-dev]
 
     runs-on: ${{ matrix.os }}
 

README.md

@@ -18,7 +18,7 @@ Gateway.
 Built on good intentions and the hope that it will be extendable and reusable, rather than an obstacle for future
 development.
 
-Python 3.8, 3.9 and 3.10 are currently supported.
+Python 3.8, 3.9 and 3.10 and 3.11-dev are currently supported.
 
 ## Installation
 
@@ -168,7 +168,7 @@ other internal settings in the interpreter.
 ### `hikari[speedups]`
 
 If you have a C compiler (Microsoft VC++ Redistributable 14.0 or newer, or a modern copy of GCC/G++, Clang, etc), you
-can install Hikari using `pip install -U hikari[speedups]`. This will install `aiodns`, `cchardet`, `Brotli`, and
+can install Hikari using `pip install -U hikari[speedups]`. This will install `aiohttp` with its available speedups, and
 `ciso8601` which will provide you with a small performance boost.
 
 ### `uvloop`

changes/847.feature.md

@@ -0,0 +1 @@
+Add python 3.11-dev support.

hikari/impl/interaction_server.py

@@ -341,12 +341,12 @@ async def aiohttp_hook(self, request: aiohttp.web.Request) -> aiohttp.web.Respon
 
             return aiohttp.web.Response(status=response.status_code, headers=response.headers, body=multipart)
 
-        headers = response.headers
-        if response.content_type:
-            headers = headers or {}
-            headers[_CONTENT_TYPE_KEY] = response.content_type
-
-        return aiohttp.web.Response(status=response.status_code, headers=headers, body=response.payload)
+        return aiohttp.web.Response(
+            status=response.status_code,
+            headers=response.headers,
+            body=response.payload,
+            content_type=response.content_type,
+        )
 
     async def close(self) -> None:
         """Gracefully close the server and any open connections."""

setup.py

@@ -65,7 +65,7 @@ def parse_requirements_file(path):
     maintainer_email=metadata.email,
     license=metadata.license,
     url=metadata.url,
-    python_requires=">=3.8.0,<3.11",
+    python_requires=">=3.8.0,<3.12",
     packages=setuptools.find_namespace_packages(include=["hikari*"]),
     entry_points={"console_scripts": ["hikari = hikari.cli:main"]},
     install_requires=parse_requirements_file("requirements.txt"),
@@ -94,6 +94,7 @@ def parse_requirements_file(path):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Communications :: Chat",
         "Topic :: Internet :: WWW/HTTP",

speedup-requirements.txt

@@ -1,4 +1,2 @@
-aiodns~=3.0
-cchardet~=2.1
-Brotli~=1.0
+aiohttp[speedups]~=3.8
 ciso8601~=2.2

tests/hikari/impl/test_interaction_server.py

@@ -326,7 +326,7 @@ async def test__fetch_public_key_when_public_key_already_set(
     async def test_aiohttp_hook(self, mock_interaction_server: interaction_server_impl.InteractionServer):
         mock_interaction_server.on_interaction = mock.AsyncMock(
             return_value=mock.Mock(
-                payload=b"abody", files=[], status_code=200, headers={"header1": "ok"}, content_type="oogabooga"
+                payload=b"abody", files=[], status_code=200, headers={"header1": "ok"}, content_type="ooga/booga"
             )
         )
         request = mock.Mock(
@@ -342,16 +342,16 @@ async def test_aiohttp_hook(self, mock_interaction_server: interaction_server_im
             body=b"bfddasdasd", signature=b"troekpewieojksi9", timestamp=b"123123"
         )
         assert result.body == b"abody"
-        assert result.content_type == "oogabooga"
-        assert result.headers == {"header1": "ok", "Content-Type": "oogabooga"}
+        assert result.content_type == "ooga/booga"
+        assert result.headers == {"header1": "ok", "Content-Type": "ooga/booga"}
         assert result.status == 200
 
     @pytest.mark.asyncio()
     async def test_aiohttp_hook_when_no_other_headers(
         self, mock_interaction_server: interaction_server_impl.InteractionServer
     ):
         mock_interaction_server.on_interaction = mock.AsyncMock(
-            return_value=mock.Mock(payload=b"abody", files=[], headers=None, status_code=200, content_type="oogabooga")
+            return_value=mock.Mock(payload=b"abody", files=[], headers=None, status_code=200, content_type="ooga/booga")
         )
         request = mock.Mock(
             aiohttp.web.Request,
@@ -366,8 +366,8 @@ async def test_aiohttp_hook_when_no_other_headers(
             body=b"bfddasdasd", signature=b"troekpewieojksi9", timestamp=b"123123"
         )
         assert result.body == b"abody"
-        assert result.content_type == "oogabooga"
-        assert result.headers == {"Content-Type": "oogabooga"}
+        assert result.content_type == "ooga/booga"
+        assert result.headers == {"Content-Type": "ooga/booga"}
         assert result.status == 200
 
     @pytest.mark.asyncio()
@@ -378,7 +378,7 @@ async def test_aiohttp_hook_when_files(self, mock_interaction_server: interactio
                 files=[files.Bytes("x" * 329, "meow.txt"), files.Bytes("y" * 124, "nyaa.txt")],
                 status_code=200,
                 headers={"header1": "ok"},
-                content_type="oogabooga",
+                content_type="ooga/booga",
             )
         )
         request = mock.Mock(
@@ -406,7 +406,7 @@ async def test_aiohttp_hook_when_files(self, mock_interaction_server: interactio
 
         boundary = result.body.boundary.encode()
         assert mock_writer.payload == (
-            b"--" + boundary + b"""\r\nContent-Type: oogabooga\r\nContent-Disposition: form-data; name="payload_json"""
+            b"--" + boundary + b"""\r\nContent-Type: ooga/booga\r\nContent-Disposition: form-data; name="payload_json"""
             b""""\r\nContent-Length: 5\r\n\r\nabody\r\n--""" + boundary + b"""\r\nContent-Type: text/plain\r\nConten"""
             b"""t-Disposition: form-data; name="files[0]"; filename="meow.txt"\r\n\r\nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"""
             b"""xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"""