From 6fec211488f87f9207fda9c39b21e83c6359c727 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 23 Nov 2009 04:51:35 +0000 Subject: - The ``repoze.bfg.scripting.get_root`` API now uses a 'real' WebOb request rather than a FakeRequest when it sets up the request as a threadlocal. - The ``repoze.bfg.traversal.traverse`` API now uses a 'real' WebOb request rather than a FakeRequest when it calls the traverser. - The ``repoze.bfg.request.FakeRequest`` class has been removed. ``repoze.bfg.url.route_url`` ``repoze.bfg.url.model_url`` ``repoze.bfg.url.static_url`` ``repoze.bfg.traversal.virtual_root`` Each of these functions now expects to be called with a request object that has a ``registry`` attribute which represents the current ZCA registry. Get rid of extraneous uses of ZCA threadlocal API. --- repoze/bfg/resource.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'repoze/bfg/resource.py') diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py index ca6cee543..d76dbcaac 100644 --- a/repoze/bfg/resource.py +++ b/repoze/bfg/resource.py @@ -1,11 +1,10 @@ import os -import sys import pkg_resources -from zope.component import queryUtility from zope.interface import implements from repoze.bfg.interfaces import IPackageOverrides +from repoze.bfg.threadlocal import get_current_registry class OverrideProvider(pkg_resources.DefaultProvider): def __init__(self, module): @@ -13,7 +12,8 @@ class OverrideProvider(pkg_resources.DefaultProvider): self.module_name = module.__name__ def _get_overrides(self): - overrides = queryUtility(IPackageOverrides, self.module_name) + reg = get_current_registry() + overrides = reg.queryUtility(IPackageOverrides, self.module_name) return overrides def get_resource_filename(self, manager, resource_name): -- cgit v1.2.3