Chris McDonough
2012-08-25 405213d0ee1f60de38e7ed49f50df3b8480b7c66
_get_predlist -> get_predlist
5 files modified
18 ■■■■ changed files
pyramid/config/__init__.py 4 ●●●● patch | view | raw | blame | history
pyramid/config/adapters.py 2 ●●● patch | view | raw | blame | history
pyramid/config/routes.py 2 ●●● patch | view | raw | blame | history
pyramid/config/views.py 2 ●●● patch | view | raw | blame | history
pyramid/tests/test_config/test_adapters.py 8 ●●●● patch | view | raw | blame | history
pyramid/config/__init__.py
@@ -492,7 +492,7 @@
        _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 @@
        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,),
pyramid/config/adapters.py
@@ -49,7 +49,7 @@
            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)
pyramid/config/routes.py
@@ -432,7 +432,7 @@
                    )
                )
            predlist = self._get_predlist('route')
            predlist = self.get_predlist('route')
            _, preds, _ = predlist.make(self, **pvals)
            route = mapper.connect(
                name, pattern, factory, predicates=preds,
pyramid/config/views.py
@@ -1105,7 +1105,7 @@
            )
        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
pyramid/tests/test_config/test_adapters.py
@@ -93,7 +93,7 @@
        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 @@
        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 @@
        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 @@
        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)