From f5ff7e0dd3a5b8bc1fd6978e361c9ab8391b6960 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 2 Apr 2017 12:50:48 -0500 Subject: push the threadlocal registry while config.include executes --- pyramid/config/__init__.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 304d3a85e..6c661aa59 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -753,6 +753,11 @@ class Configurator( .. versionadded:: 1.2 The ``route_prefix`` parameter. + .. versionchanged:: 1.9 + The included function is wrapped with a call to + :meth:`pyramid.config.Configurator.begin` and + :meth:`pyramid.config.Configurator.end` while it is executed. + """ # """ <-- emacs @@ -802,7 +807,11 @@ class Configurator( ) configurator.basepath = os.path.dirname(sourcefile) configurator.includepath = self.includepath + (spec,) - c(configurator) + self.begin() + try: + c(configurator) + finally: + self.end() def add_directive(self, name, directive, action_wrap=True): """ -- cgit v1.2.3