diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-11-28 05:07:24 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-11-28 05:07:24 +0000 |
| commit | 3b4ea2c8c9f431d7f54a1a597eb3a3dc581f46eb (patch) | |
| tree | a510dec6929b74cacd03137a17e6d576be3fc66a | |
| parent | 5464c6a525449fdf3eb433916734f639ce5205ff (diff) | |
| download | pyramid-3b4ea2c8c9f431d7f54a1a597eb3a3dc581f46eb.tar.gz pyramid-3b4ea2c8c9f431d7f54a1a597eb3a3dc581f46eb.tar.bz2 pyramid-3b4ea2c8c9f431d7f54a1a597eb3a3dc581f46eb.zip | |
Bug found through interactive usage.
| -rw-r--r-- | repoze/bfg/tests/test_zcml.py | 1 | ||||
| -rw-r--r-- | repoze/bfg/zcml.py | 22 |
2 files changed, 12 insertions, 11 deletions
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 1f6703d5d..e00b02f74 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -960,6 +960,7 @@ class DummyContext: self.actions = [] self.info = None self.resolved = resolved + self.package = None def action(self, discriminator, callable=None, args=(), kw={}, order=0): self.actions.append( diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py index e2ea50ab4..41945c448 100644 --- a/repoze/bfg/zcml.py +++ b/repoze/bfg/zcml.py @@ -167,7 +167,7 @@ def view( renderer = path_spec(_context, renderer) def register(): - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config.add_view( permission=permission, for_=for_, view=view, name=name, request_type=request_type, route_name=route_name, @@ -246,7 +246,7 @@ def route(_context, name, path, view=None, view_for=None, view_renderer = path_spec(_context, view_renderer) def register(): - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config.add_route( name, path, @@ -324,7 +324,7 @@ class SystemViewHandler(object): def register(iface=self.iface): reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config._system_view(iface, view=view, attr=attr, renderer=renderer, wrapper=wrapper, _info=_context.info) @@ -352,7 +352,7 @@ class IResourceDirective(Interface): def resource(_context, to_override, override_with): reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) _context.action( discriminator = None, @@ -372,7 +372,7 @@ def repozewho1authenticationpolicy(_context, identifier_name='auth_tkt', # authentication policies must be registered eagerly so they can # be found by the view registration machinery reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config._set_authentication_policy(policy, _info=_context.info) _context.action(discriminator=IAuthenticationPolicy) @@ -388,7 +388,7 @@ def remoteuserauthenticationpolicy(_context, environ_key='REMOTE_USER', # authentication policies must be registered eagerly so they can # be found by the view registration machinery reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config._set_authentication_policy(policy, _info=_context.info) _context.action(discriminator=IAuthenticationPolicy) @@ -426,7 +426,7 @@ def authtktauthenticationpolicy(_context, # authentication policies must be registered eagerly so they can # be found by the view registration machinery reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config._set_authentication_policy(policy, _info=_context.info) _context.action(discriminator=IAuthenticationPolicy) @@ -438,7 +438,7 @@ def aclauthorizationpolicy(_context): # authorization policies must be registered eagerly so they can be # found by the view registration machinery reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config._set_authorization_policy(policy, _info=_context.info) _context.action(discriminator=IAuthorizationPolicy) @@ -455,7 +455,7 @@ def renderer(_context, factory, name=''): # renderer factories must be registered eagerly so they can be # found by the view machinery reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) config.add_renderer(name, factory, _info=_context.info) _context.action(discriminator=(IRendererFactory, name)) @@ -483,7 +483,7 @@ def static(_context, name, path, cache_max_age=3600): """ path = path_spec(_context, path) reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) _context.action( discriminator = ('route', name, False, None, None, None, None, None), @@ -506,7 +506,7 @@ class IScanDirective(Interface): def scan(_context, package): reg = get_current_registry() - config = Configurator(reg) + config = Configurator(reg, package=_context.package) _context.action( discriminator=None, callable=config.scan, |
