Switch to async/await syntax

demo/database_auth/handlers.py

@@ -1,4 +1,3 @@
-import asyncio
 import functools
 
 from aiohttp import web
@@ -10,14 +9,13 @@ from .db_auth import check_credentials
 
 def require(permission):
     def wrapper(f):
-        @asyncio.coroutine
         @functools.wraps(f)
-        def wrapped(self, request):
-            has_perm = yield from permits(request, permission)
+        async def wrapped(self, request):
+            has_perm = await permits(request, permission)
             if not has_perm:
                 message = 'User has no permission {}'.format(permission)
                 raise web.HTTPForbidden(body=message.encode())
-            return (yield from f(self, request))
+            return await f(self, request)
         return wrapped
     return wrapper
 
@@ -40,9 +38,8 @@ class Web(object):
 </body>
 """
 
-    @asyncio.coroutine
-    def index(self, request):
-        username = yield from authorized_userid(request)
+    async def index(self, request):
+        username = await authorized_userid(request)
         if username:
             template = self.index_template.format(
                 message='Hello, {username}!'.format(username=username))
@@ -51,37 +48,33 @@ class Web(object):
         response = web.Response(body=template.encode())
         return response
 
-    @asyncio.coroutine
-    def login(self, request):
+    async def login(self, request):
         response = web.HTTPFound('/')
-        form = yield from request.post()
+        form = await request.post()
         login = form.get('login')
         password = form.get('password')
         db_engine = request.app.db_engine
-        if (yield from check_credentials(db_engine, login, password)):
-            yield from remember(request, response, login)
+        if await check_credentials(db_engine, login, password):
+            await remember(request, response, login)
             return response
 
         return web.HTTPUnauthorized(
             body=b'Invalid username/password combination')
 
     @require('public')
-    @asyncio.coroutine
-    def logout(self, request):
+    async def logout(self, request):
         response = web.Response(body=b'You have been logged out')
-        yield from forget(request, response)
+        await forget(request, response)
         return response
 
     @require('public')
-    @asyncio.coroutine
-    def internal_page(self, request):
+    async def internal_page(self, request):
         response = web.Response(
             body=b'This page is visible for all registered users')
         return response
 
     @require('protected')
-    @asyncio.coroutine
-    def protected_page(self, request):
+    async def protected_page(self, request):
         response = web.Response(body=b'You are on protected page')
         return response