diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-14 23:25:10 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-14 23:26:41 -0500 |
| commit | a0945399b24fb38607107a55b12b7997723de2a0 (patch) | |
| tree | 5f3a329c4aa0f212a23b4b2d245cecc3b132fa0c | |
| parent | 64bf7eec9b868fbc113341c7f5675c063aea002b (diff) | |
| download | pyramid-a0945399b24fb38607107a55b12b7997723de2a0.tar.gz pyramid-a0945399b24fb38607107a55b12b7997723de2a0.tar.bz2 pyramid-a0945399b24fb38607107a55b12b7997723de2a0.zip | |
do not guess at the name of the view deriver without further discussion
| -rw-r--r-- | docs/narr/hooks.rst | 4 | ||||
| -rw-r--r-- | pyramid/config/views.py | 3 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_derivations.py | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index 3f66f4988..e3843cfbd 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -1631,7 +1631,7 @@ is a callable that can provide timing information for the view pipeline: response.headers['X-View-Performance'] = '%.3f' % (end - start,) return wrapper_view - config.add_view_deriver(timing_view) + config.add_view_deriver(timing_view, 'timing view') View derivers are unique in that they have access to most of the options passed to :meth:`pyramid.config.Configurator.add_view` in order to decide what @@ -1656,7 +1656,7 @@ token unless ``disable_csrf=True`` is passed to the view: require_csrf_view.options = ('disable_csrf',) - config.add_view_deriver(require_csrf_view) + config.add_view_deriver(require_csrf_view, 'require_csrf_view') def myview(request): return 'protected' diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 5455c29df..6f8b24aa2 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -1097,9 +1097,6 @@ class ViewsConfiguratorMixin(object): if under is None and over is None: over = 'decorated_view' - if name is None: - name = deriver.__name__ - discriminator = ('view deriver', name) intr = self.introspectable( 'view derivers', diff --git a/pyramid/tests/test_config/test_derivations.py b/pyramid/tests/test_config/test_derivations.py index e1b6c8bc9..69d8797f4 100644 --- a/pyramid/tests/test_config/test_derivations.py +++ b/pyramid/tests/test_config/test_derivations.py @@ -1260,15 +1260,6 @@ class TestAddDeriver(unittest.TestCase): result = self.config._derive_view(view) self.assertEqual(response.deriv, ['deriv2', 'deriv3', 'deriv1']) - def test_add_deriver_without_name(self): - from pyramid.interfaces import IViewDerivers - - derivers = self.config.registry.getUtility(IViewDerivers) - self.assertFalse('deriv' in derivers.names) - def deriv(view, info): pass - self.config.add_view_deriver(deriv) - self.assertTrue('deriv' in derivers.names) - class TestDeriverIntegration(unittest.TestCase): def setUp(self): |