From 2aa86c1a5227a675d32c4ede06e0c031ae3edfad Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 25 Nov 2009 16:36:29 +0000 Subject: - Replace martian with something simpler. --- repoze/bfg/zcml.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'repoze/bfg/zcml.py') diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py index 5d6fdb8d8..b97456668 100644 --- a/repoze/bfg/zcml.py +++ b/repoze/bfg/zcml.py @@ -10,8 +10,6 @@ from zope.schema import Int from zope.schema import TextLine from zope.schema import ASCIILine -import martian - from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.interfaces import IForbiddenView @@ -501,13 +499,14 @@ class IScanDirective(Interface): required=True, ) -def scan(_context, package, martian=martian): - # martian overrideable only for unit tests - def register(): - reg = get_current_registry() - config = Configurator(reg) - config.scan(package, _info=_context.info, martian=martian) - _context.action(discriminator=None, callable=register) +def scan(_context, package): + reg = get_current_registry() + config = Configurator(reg) + _context.action( + discriminator=None, + callable=config.scan, + args=(package, _context.info) + ) def zcml_configure(name, package): """ Given a ZCML filename as ``name`` and a Python package as -- cgit v1.2.3