Use coroutines when rendering

bmwant · bmwant · commit 209f1b2c7476 · 2017-09-11T14:54:21.000+03:00
diff --git a/aiohttp_jinja2/__init__.py b/aiohttp_jinja2/__init__.py
@@ -38,6 +38,7 @@ def get_env(app, *, app_key=APP_KEY):
     return app.get(app_key)
 
 
+@asyncio.coroutine
 def render_string(template_name, request, context, *, app_key=APP_KEY):
     env = request.app.get(app_key)
     if env is None:
@@ -59,16 +60,18 @@ def render_string(template_name, request, context, *, app_key=APP_KEY):
         raise web.HTTPInternalServerError(reason=text, text=text)
     if request.get(REQUEST_CONTEXT_KEY):
         context = dict(request[REQUEST_CONTEXT_KEY], **context)
-    text = template.render(context)
+    text = yield from template.render(context)
     return text
 
 
+@asyncio.coroutine
 def render_template(template_name, request, context, *,
                     app_key=APP_KEY, encoding='utf-8', status=200):
     response = web.Response(status=status)
     if context is None:
         context = {}
-    text = render_string(template_name, request, context, app_key=app_key)
+    text = yield from render_string(template_name, request, context,
+                                    app_key=app_key)
     response.content_type = 'text/html'
     response.charset = encoding
     response.text = text
@@ -95,8 +98,9 @@ def wrapped(*args):
             else:
                 request = args[-1]
 
-            response = render_template(template_name, request, context,
-                                       app_key=app_key, encoding=encoding)
+            response = yield from render_template(
+                template_name, request, context,
+                app_key=app_key, encoding=encoding)
             response.set_status(status)
             return response
         return wrapped
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -13,7 +13,7 @@ def aiohttp_app(template):
             loader=jinja2.DictLoader({
                 'tmpl.jinja2': template
             }),
-            enable_async=False,
+            enable_async=True,
          )
         return app
 
diff --git a/tests/test_async_enabled.py b/tests/test_async_enabled.py
@@ -0,0 +1,33 @@
+import asyncio
+
+import jinja2
+import aiohttp_jinja2
+from aiohttp import web
+
+
+@asyncio.coroutine
+def test_func(loop, test_client):
+
+    @aiohttp_jinja2.template('tmpl.jinja2')
+    @asyncio.coroutine
+    def func(request):
+        return {'head': 'HEAD', 'text': 'text'}
+
+    template = '<html><body><h1>{{head}}</h1>{{text}}</body></html>'
+
+    app = web.Application(loop=loop)
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': template
+        }),
+    )
+
+    app.router.add_route('*', '/', func)
+
+    client = yield from test_client(app)
+
+    resp = yield from client.get('/')
+    assert 200 == resp.status
+    txt = yield from resp.text()
+    assert '<html><body><h1>HEAD</h1>text</body></html>' == txt

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ def aiohttp_app(template):`
`13`	`13`	`loader=jinja2.DictLoader({`
`14`	`14`	`'tmpl.jinja2': template`
`15`	`15`	`}),`
`16`		`- enable_async=False,`
	`16`	`+ enable_async=True,`
`17`	`17`	`)`
`18`	`18`	`return app`
`19`	`19`