summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-08 00:22:52 -0500
committerChris McDonough <chrism@plope.com>2010-12-08 00:22:52 -0500
commitbf162ef8a0c9d4267e4a30ea73ef3d90426a90f4 (patch)
tree2882bcefc0e5abd5d0df3cb16b9c089a4742fe9b
parent7d8132a8f72f81ead76bd71a6602e2db9b27502d (diff)
downloadpyramid-bf162ef8a0c9d4267e4a30ea73ef3d90426a90f4.tar.gz
pyramid-bf162ef8a0c9d4267e4a30ea73ef3d90426a90f4.tar.bz2
pyramid-bf162ef8a0c9d4267e4a30ea73ef3d90426a90f4.zip
load_zcml and scan are also config methods
-rw-r--r--pyramid/configuration.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pyramid/configuration.py b/pyramid/configuration.py
index c0fb8ce78..540fa597e 100644
--- a/pyramid/configuration.py
+++ b/pyramid/configuration.py
@@ -717,6 +717,7 @@ class Configurator(object):
self.manager.pop()
return app
+ @config_method
def load_zcml(self, spec='configure.zcml', lock=threading.Lock()):
""" Load configuration from a :term:`ZCML` file into the
current configuration state. The ``spec`` argument is an
@@ -1680,6 +1681,7 @@ class Configurator(object):
self.registry.registerUtility(mapper, IRoutesMapper)
return mapper
+ @config_method
def scan(self, package=None, categories=None):
""" Scan a Python package and any of its subpackages for
objects marked with :term:`configuration decoration` such as