fix invoke_subrequest to always invoke callbacks even when use_tweens…

…=False

pyramid/request.py

@@ -20,6 +20,7 @@
     iteritems_,
     )
 
+from pyramid.events import NewResponse
 from pyramid.decorator import reify
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.response import Response, _get_response_factory
@@ -332,3 +333,12 @@ def apply_request_extensions(request, extensions=None):
 
         InstancePropertyHelper.apply_properties(
             request, extensions.descriptors)
+
+def _execute_response_callbacks(request, response):
+    """ Execute response callbacks and emit a NewResponse event."""
+    registry = request.registry
+    if getattr(request, 'response_callbacks', False):
+        request._process_response_callbacks(response)
+
+    if registry.has_listeners:
+        registry.notify(NewResponse(request, response))

pyramid/router.py

@@ -26,6 +26,7 @@
 from pyramid.request import Request
 from pyramid.view import _call_view
 from pyramid.request import apply_request_extensions
+from pyramid.request import _execute_response_callbacks
 from pyramid.threadlocal import manager
 
 from pyramid.traversal import (
@@ -202,7 +203,14 @@ def invoke_subrequest(self, request, use_tweens=False):
                 extensions = self.request_extensions
                 if extensions is not None:
                     apply_request_extensions(request, extensions=extensions)
+
                 response = handle_request(request)
+
+                # bw-compat, in Pyramid < 1.8 callbacks were executed even
+                # when use_tweens was false
+                if not use_tweens:
+                    _execute_response_callbacks(request, response)
+
                 return response
 
             finally:

pyramid/tweens.py

@@ -72,15 +72,9 @@ def response_callbacks_tween_factory(handler, registry):
     :meth:`pyramid.request.Request.add_response_callback`.
 
     """
-    notify = registry.notify
     def response_callbacks_tween(request):
         response = handler(request)
-
-        if getattr(request, 'response_callbacks', False):
-            request._process_response_callbacks(response)
-
-        registry.has_listeners and notify(NewResponse(request, response))
-
+        _execute_response_callbacks(request, response)
         return response
     return response_callbacks_tween