summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-25 03:19:37 -0400
committerChris McDonough <chrism@plope.com>2012-08-25 03:19:37 -0400
commit405213d0ee1f60de38e7ed49f50df3b8480b7c66 (patch)
tree7d815b20e4103bc7342913ac2aeaa6acab847212
parenta31280b563d40aaa3ab102811df53c33c6d06a70 (diff)
downloadpyramid-405213d0ee1f60de38e7ed49f50df3b8480b7c66.tar.gz
pyramid-405213d0ee1f60de38e7ed49f50df3b8480b7c66.tar.bz2
pyramid-405213d0ee1f60de38e7ed49f50df3b8480b7c66.zip
_get_predlist -> get_predlist
-rw-r--r--pyramid/config/__init__.py4
-rw-r--r--pyramid/config/adapters.py2
-rw-r--r--pyramid/config/routes.py2
-rw-r--r--pyramid/config/views.py2
-rw-r--r--pyramid/tests/test_config/test_adapters.py8
5 files changed, 9 insertions, 9 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index de09cfbcf..1dc438597 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -492,7 +492,7 @@ class Configurator(
_get_introspector, _set_introspector, _del_introspector
)
- def _get_predlist(self, name):
+ def get_predlist(self, name):
predlist = self.registry.queryUtility(IPredicateList, name=name)
if predlist is None:
predlist = PredicateList()
@@ -512,7 +512,7 @@ class Configurator(
intr['weighs_more_than'] = weighs_more_than
intr['weighs_less_than'] = weighs_less_than
def register():
- predlist = self._get_predlist(type)
+ predlist = self.get_predlist(type)
predlist.add(name, factory, weighs_more_than=weighs_more_than,
weighs_less_than=weighs_less_than)
self.action(discriminator, register, introspectables=(intr,),
diff --git a/pyramid/config/adapters.py b/pyramid/config/adapters.py
index 865e66a4a..12c4de660 100644
--- a/pyramid/config/adapters.py
+++ b/pyramid/config/adapters.py
@@ -49,7 +49,7 @@ class AdaptersConfiguratorMixin(object):
iface = (iface,)
def register():
- predlist = self._get_predlist('subscriber')
+ predlist = self.get_predlist('subscriber')
order, preds, phash = predlist.make(self, **predicates)
intr.update({'phash':phash, 'order':order, 'predicates':preds})
derived_subscriber = self._derive_subscriber(subscriber, preds)
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 6796a1c5d..1a7fdfac9 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -432,7 +432,7 @@ class RoutesConfiguratorMixin(object):
)
)
- predlist = self._get_predlist('route')
+ predlist = self.get_predlist('route')
_, preds, _ = predlist.make(self, **pvals)
route = mapper.connect(
name, pattern, factory, predicates=preds,
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index eaaaebdaf..19e4acbcb 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1105,7 +1105,7 @@ class ViewsConfiguratorMixin(object):
)
view_intr.update(**predicates)
introspectables.append(view_intr)
- predlist = self._get_predlist('view')
+ predlist = self.get_predlist('view')
def register(permission=permission, renderer=renderer):
# the discrim_func above is guaranteed to have been called already
diff --git a/pyramid/tests/test_config/test_adapters.py b/pyramid/tests/test_config/test_adapters.py
index 56d2acc2f..d47e012dc 100644
--- a/pyramid/tests/test_config/test_adapters.py
+++ b/pyramid/tests/test_config/test_adapters.py
@@ -93,7 +93,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
def subscriber(event):
L.append(event)
config = self._makeOne(autocommit=True)
- predlist = config._get_predlist('subscriber')
+ predlist = config.get_predlist('subscriber')
jam_predicate = predicate_maker('jam')
jim_predicate = predicate_maker('jim')
predlist.add('jam', jam_predicate)
@@ -120,7 +120,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
def subscriber(event):
L.append(event)
config = self._makeOne(autocommit=True)
- predlist = config._get_predlist('subscriber')
+ predlist = config.get_predlist('subscriber')
jam_predicate = predicate_maker('jam')
jim_predicate = predicate_maker('jim')
predlist.add('jam', jam_predicate)
@@ -146,7 +146,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
L = []
def subscriber(event): L.append(event)
config = self._makeOne(autocommit=True)
- predlist = config._get_predlist('subscriber')
+ predlist = config.get_predlist('subscriber')
jam_predicate = predicate_maker('jam')
jim_predicate = predicate_maker('jim')
predlist.add('jam', jam_predicate)
@@ -169,7 +169,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
L = []
def subscriber(event): L.append(event)
config = self._makeOne(autocommit=True)
- predlist = config._get_predlist('subscriber')
+ predlist = config.get_predlist('subscriber')
jam_predicate = predicate_maker('jam')
jim_predicate = predicate_maker('jim')
predlist.add('jam', jam_predicate)