summaryrefslogtreecommitdiff
path: root/repoze/bfg/configuration.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-18 00:37:21 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-18 00:37:21 +0000
commit57267a39be342ace47cccfcb481dcc407a48b0d7 (patch)
tree2160f1a0d4f5614f410626b6a3a3b0c76a7547ac /repoze/bfg/configuration.py
parent541e450d8098988209af3ecfd3829b242999039c (diff)
downloadpyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.tar.gz
pyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.tar.bz2
pyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.zip
- The ``repoze.bfg.registry.make_registry`` callable has been removed.
- The ``repoze.bfg.view.map_view`` callable has been removed. - The ``repoze.bfg.view.owrap_view`` callable has been removed. - The ``repoze.bfg.view.predicate_wrap`` callable has been removed. - The ``repoze.bfg.view.secure_view`` callable has been removed. - The ``repoze.bfg.view.authdebug_view`` callable has been removed. - The ``repoze.bfg.view.renderer_from_name`` callable has been removed. - Coverage.
Diffstat (limited to 'repoze/bfg/configuration.py')
-rw-r--r--repoze/bfg/configuration.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py
index 6b6aa6b86..bd1df14fd 100644
--- a/repoze/bfg/configuration.py
+++ b/repoze/bfg/configuration.py
@@ -62,7 +62,6 @@ from repoze.bfg.view import static as static_view
import martian
-
def zcml_configure(name, package):
""" Given a ZCML filename as ``name`` and a Python package as
``package`` which the filename should be relative to, load the
@@ -136,12 +135,10 @@ class Configurator(object):
zope.component.getGlobalSiteManager = get_current_registry
zcml_configure(filename, package)
finally:
- # intentional: do not call getSiteManager.reset(); executing
- # this function means we're taking over getSiteManager for the
- # lifetime of this process
zope.component.getGlobalSiteManager = getGlobalSiteManager
lock.release()
manager.pop()
+ getSiteManager.reset()
def view(self, permission=None, for_=None, view=None, name="",
request_type=None, route_name=None, request_method=None,