Fix Python 3.11 support

'asyncio.coroutine' was deprecated in 3.8 and removed in 3.11:
https://docs.python.org/3.9/library/asyncio-task.html\#asyncio.coroutine

On the other hand, the 'async def' syntax is supported since 3.5:
https://peps.python.org/pep-0492/

This also requires bumping the flake8 version, in order to support
'async def' (though it has to be flake8 < 6.0.0, in order to keep
support for Python 3.7).

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v3

aiohttp_utils/negotiation.py

@@ -202,24 +202,21 @@ def negotiation_middleware(
     """Middleware which selects a renderer for a given request then renders
     a handler's data to a `aiohttp.web.Response`.
     """
-    @asyncio.coroutine
-    def factory(app, handler):
-
-        @asyncio.coroutine
-        def middleware(request):
+    async def factory(app, handler):
+        async def middleware(request):
             content_type, renderer = negotiator(
                 request,
                 renderers,
                 force_negotiation,
             )
             request['selected_media_type'] = content_type
-            response = yield from handler(request)
+            response = await handler(request)
 
             data = getattr(response, 'data', None)
             if isinstance(response, Response) and (force_rendering or data):
                 # Render data with the selected renderer
                 if asyncio.iscoroutinefunction(renderer):
-                    render_result = yield from renderer(request, data)
+                    render_result = await renderer(request, data)
                 else:
                     render_result = renderer(request, data)
             else:

dev-requirements.txt

@@ -12,6 +12,6 @@ wheel
 twine
 
 # Syntax checking
-flake8==2.4.1
+flake8==5.0.4
 
 -e .

examples/kitchen_sink.py

@@ -18,23 +18,19 @@
     $ http :8000/
     $ http :8000/api/
 """
-from asyncio import coroutine
-
 from aiohttp import web
 from aiohttp_utils import Response, routing, negotiation
 
 app = web.Application(router=routing.ResourceRouter())
 
 
-@coroutine
-def index(request):
+async def index(request):
     return Response('Welcome!')
 
 
 class HelloResource:
 
-    @coroutine
-    def get(self, request):
+    async def get(self, request):
         return Response({
             'message': 'Welcome to the API!'
         })

examples/mako_example.py

@@ -15,7 +15,6 @@
 """
 from collections import OrderedDict
 from collections.abc import Mapping
-from asyncio import coroutine
 
 from aiohttp import web
 from aiohttp_utils import Response, negotiation
@@ -39,8 +38,7 @@
 
 # ##### Handlers #####
 
-@coroutine
-def index(request):
+async def index(request):
     return Response({
         'message': 'Hello ' + request.query.get('name', 'World')
     })

tests/conftest.py

@@ -27,7 +27,6 @@ def maker(app, *args, **kwargs):
 
 
 def make_dummy_handler(**kwargs):
-    @asyncio.coroutine
-    def dummy(request):
+    async def dummy(request):
         return web.Response(**kwargs)
     return dummy

tests/test_negotiation.py

@@ -1,5 +1,4 @@
 import pytest
-import asyncio
 from collections import OrderedDict
 
 from aiohttp import web
@@ -28,12 +27,10 @@ def handler_false(request):
     def handler_none(request):
         return Response(None)
 
-    @asyncio.coroutine
-    def coro_handler(request):
+    async def coro_handler(request):
         return Response({'message': 'Hello coro'})
 
-    @asyncio.coroutine
-    def post_coro_handler(request):
+    async def post_coro_handler(request):
         return Response({'message': 'Post coro'}, status=201)
 
     def handler_no_nego(request):

tests/test_routing.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import pytest
-import asyncio
 
 from aiohttp import web
 
@@ -25,8 +24,7 @@ class MyResource:
         def get(self, request):
             return web.Response(body=b'Got it', content_type='text/plain')
 
-        @asyncio.coroutine
-        def post(self, request):
+        async def post(self, request):
             return web.Response(body=b'Posted it', content_type='text/plain')
 
     class MyResource2:

tests/views.py

@@ -1,43 +1,34 @@
 """Handlers for testing routing"""
-from asyncio import coroutine
-
 from aiohttp import web
 
 
-@coroutine
-def index(request):
+async def index(request):
     return web.Response()
 
 
-@coroutine
-def list_projects(request):
+async def list_projects(request):
     return web.Response()
 
 
-@coroutine
-def create_projects(request):
+async def create_projects(request):
     return web.Response()
 
 
 class ArticleResource:
 
-    @coroutine
-    def get(self, request):
+    async def get(self, request):
         return web.Response()
 
-    @coroutine
-    def post(self, request):
+    async def post(self, request):
         return web.Response()
 
 
 class ArticleList:
 
-    @coroutine
-    def get(self, request):
+    async def get(self, request):
         return web.Response()
 
-    @coroutine
-    def post(self, request):
+    async def post(self, request):
         return web.Response()
 
 
@@ -46,6 +37,5 @@ class AuthorList:
     def __init__(self, db):
         self.db = db
 
-    @coroutine
-    def get(self, request):
+    async def get(self, request):
         return web.Response()

tox.ini

@@ -7,6 +7,7 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [testenv]
 deps=