From a910801673be7f6b6a7de18300a618ab5e6e0afe Mon Sep 17 00:00:00 2001
From: Alexey Popravka <popravich@users.noreply.github.com>
Date: Mon, 4 Dec 2017 18:32:13 +0200
Subject: [PATCH] Correct request.app context (for handlers not just
 middlewares) (#2577)

* yield _fix_request_current_app middleware uncoditionally; update test; (see #2550)

* Add change notes
---
 CHANGES/2577.bugfix          |  1 +
 aiohttp/web.py               |  3 +--
 tests/test_web_functional.py | 36 +++++++++++++++++++++++++-----------
 3 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 CHANGES/2577.bugfix

diff --git a/CHANGES/2577.bugfix b/CHANGES/2577.bugfix
new file mode 100644
index 00000000000..9b7117e752d
--- /dev/null
+++ b/CHANGES/2577.bugfix
@@ -0,0 +1 @@
+Correct `request.app` context (for handlers not just middlewares).
diff --git a/aiohttp/web.py b/aiohttp/web.py
index 26bd5eaa6ce..4d473912e4d 100644
--- a/aiohttp/web.py
+++ b/aiohttp/web.py
@@ -268,8 +268,7 @@ def _prepare_middleware(self):
                               'see #2252'.format(m),
                               DeprecationWarning, stacklevel=2)
                 yield m, False
-        if self._middlewares:
-            yield _fix_request_current_app(self), True
+        yield _fix_request_current_app(self), True
 
     async def _handle(self, request):
         match_info = await self._router.resolve(request)
diff --git a/tests/test_web_functional.py b/tests/test_web_functional.py
index 3b6ca32fc16..43984a8339b 100644
--- a/tests/test_web_functional.py
+++ b/tests/test_web_functional.py
@@ -1290,32 +1290,46 @@ async def on_signal(app):
     assert [app, subapp1, subapp2] == order
 
 
-@pytest.mark.parametrize('route,expected', [
-    ('/sub/', ['app see root', 'subapp see sub']),
-    ('/', ['app see root']),
+@pytest.mark.parametrize('route,expected,middlewares', [
+    ('/sub/', ['A: root', 'C: sub', 'D: sub'], 'AC'),
+    ('/', ['A: root', 'B: root'], 'AC'),
+    ('/sub/', ['A: root', 'D: sub'], 'A'),
+    ('/', ['A: root', 'B: root'], 'A'),
+    ('/sub/', ['C: sub', 'D: sub'], 'C'),
+    ('/', ['B: root'], 'C'),
+    ('/sub/', ['D: sub'], ''),
+    ('/', ['B: root'], ''),
 ])
-async def test_subapp_middleware_context(loop, test_client, route, expected):
+async def test_subapp_middleware_context(
+        loop, test_client, route, expected, middlewares):
     values = []
 
     def show_app_context(appname):
         @web.middleware
         async def middleware(request, handler):
-            values.append('{} see {}'.format(appname, request.app['my_value']))
+            values.append('{}: {}'.format(
+                appname, request.app['my_value']))
             return await handler(request)
         return middleware
 
-    async def handler(request):
-        return web.Response(text='Ok')
+    def make_handler(appname):
+        async def handler(request):
+            values.append('{}: {}'.format(
+                appname, request.app['my_value']))
+            return web.Response(text='Ok')
+        return handler
 
     app = web.Application()
     app['my_value'] = 'root'
-    app.middlewares.append(show_app_context('app'))
-    app.router.add_get('/', handler)
+    if 'A' in middlewares:
+        app.middlewares.append(show_app_context('A'))
+    app.router.add_get('/', make_handler('B'))
 
     subapp = web.Application()
     subapp['my_value'] = 'sub'
-    subapp.middlewares.append(show_app_context('subapp'))
-    subapp.router.add_get('/', handler)
+    if 'C' in middlewares:
+        subapp.middlewares.append(show_app_context('C'))
+    subapp.router.add_get('/', make_handler('D'))
     app.add_subapp('/sub/', subapp)
 
     client = await test_client(app)