Fix #1947: don't raise DeprecationWarning inside on_startup() handler…

… for run_app()
aio-libs · Jun 14, 2017 · 8f3d8f2 · 8f3d8f2
1 parent ed28add
commit 8f3d8f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -18,7 +18,7 @@ Changes
 
 - Use CIMultiDict for ClientRequest.skip_auto_headers #1970
 
-- Fix wrong startup sequence: test server doesn't raise
+- Fix wrong startup sequence: test server and `run_app()` are not raise
   `DeprecationWarning` now #1947
 
 -

diff --git a/aiohttp/web.py b/aiohttp/web.py
@@ -336,14 +336,15 @@ def run_app(app, *, host=None, port=None, path=None, sock=None,
     if loop is None:
         loop = asyncio.get_event_loop()
 
+    app._set_loop(loop)
+    loop.run_until_complete(app.startup())
+
     make_handler_kwargs = dict()
     if access_log_format is not None:
         make_handler_kwargs['access_log_format'] = access_log_format
     handler = app.make_handler(loop=loop, access_log=access_log,
                                **make_handler_kwargs)
 
-    loop.run_until_complete(app.startup())
-
     scheme = 'https' if ssl_context else 'http'
     base_url = URL('{}://localhost'.format(scheme)).with_port(port)