diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-09 00:17:01 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-09 00:41:02 -0600 |
| commit | 46fd86919578221b339a18de90e926ef12e764d3 (patch) | |
| tree | 2585ebfcf8e94dbed0b97ec77195e809ef8646fe | |
| parent | ff8c19258b05ed25824ae4a6ae90e62762df8c74 (diff) | |
| download | pyramid-46fd86919578221b339a18de90e926ef12e764d3.tar.gz pyramid-46fd86919578221b339a18de90e926ef12e764d3.tar.bz2 pyramid-46fd86919578221b339a18de90e926ef12e764d3.zip | |
expect derivers
it was a bug to try ``[].sorted()`` if no derivers, so just expect some
for now as the fallback was unused
| -rw-r--r-- | pyramid/config/views.py | 8 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_derivations.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 8b4a89388..6511ecd1e 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -751,7 +751,7 @@ class ViewsConfiguratorMixin(object): def discrim_func(): # We need to defer the discriminator until we know what the phash # is. It can't be computed any sooner because thirdparty - # predicates/view derivations may not yet exist when add_view is + # predicates/view derivers may not yet exist when add_view is # called. valid_predicates = predlist.names() pvals = {} @@ -1021,11 +1021,11 @@ class ViewsConfiguratorMixin(object): ('attr_wrapped_view', d.attr_wrapped_view)] view = info.original_view - derivers = self.registry.queryUtility(IViewDerivers, default=[]) - for name, derivation in ( + derivers = self.registry.getUtility(IViewDerivers) + for name, deriver in ( inner_derivers + derivers.sorted() + outer_derivers ): - view = wraps_view(derivation)(view, info) + view = wraps_view(deriver)(view, info) return view @action_method diff --git a/pyramid/tests/test_config/test_derivations.py b/pyramid/tests/test_config/test_derivations.py index 9eb8598e4..ec7ef1434 100644 --- a/pyramid/tests/test_config/test_derivations.py +++ b/pyramid/tests/test_config/test_derivations.py @@ -1101,7 +1101,7 @@ class TestDerivationOrder(unittest.TestCase): self.config.add_view_deriver('deriv2', None, over='deriv1') self.config.add_view_deriver('deriv3', None, under='deriv2') - derivers = self.config.registry.queryUtility(IViewDerivers, default=[]) + derivers = self.config.registry.getUtility(IViewDerivers) derivers_sorted = derivers.sorted() dlist = [d for (d, _) in derivers_sorted] self.assertEqual([ @@ -1123,7 +1123,7 @@ class TestDerivationOrder(unittest.TestCase): self.config.add_view_deriver('deriv2', None) self.config.add_view_deriver('deriv3', None) - derivers = self.config.registry.queryUtility(IViewDerivers, default=[]) + derivers = self.config.registry.getUtility(IViewDerivers) derivers_sorted = derivers.sorted() dlist = [d for (d, _) in derivers_sorted] self.assertEqual([ @@ -1143,7 +1143,7 @@ class TestDerivationOrder(unittest.TestCase): self.config.add_view_deriver('deriv1', None, over='rendered_view') - derivers = self.config.registry.queryUtility(IViewDerivers, default=[]) + derivers = self.config.registry.getUtility(IViewDerivers) derivers_sorted = derivers.sorted() dlist = [d for (d, _) in derivers_sorted] self.assertEqual(['deriv1', @@ -1163,7 +1163,7 @@ class TestDerivationOrder(unittest.TestCase): self.config.add_view_deriver('deriv2', None) self.config.add_view_deriver('deriv3', None) - derivers = self.config.registry.queryUtility(IViewDerivers, default=[]) + derivers = self.config.registry.getUtility(IViewDerivers) derivers_sorted = derivers.sorted() dlist = [d for (d, _) in derivers_sorted] self.assertEqual(['deriv1', |