summaryrefslogtreecommitdiff
path: root/repoze/bfg/zcml.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-25 16:36:29 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-25 16:36:29 +0000
commit2aa86c1a5227a675d32c4ede06e0c031ae3edfad (patch)
tree83423e9f192b41ac4c94b05ef8a37a23bf6df59c /repoze/bfg/zcml.py
parent6f01c68cf897ad5116c00c949b6e9ef96de1d658 (diff)
downloadpyramid-2aa86c1a5227a675d32c4ede06e0c031ae3edfad.tar.gz
pyramid-2aa86c1a5227a675d32c4ede06e0c031ae3edfad.tar.bz2
pyramid-2aa86c1a5227a675d32c4ede06e0c031ae3edfad.zip
- Replace martian with something simpler.
Diffstat (limited to 'repoze/bfg/zcml.py')
-rw-r--r--repoze/bfg/zcml.py17
1 files changed, 8 insertions, 9 deletions
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