summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-02 20:17:53 -0500
committerChris McDonough <chrism@plope.com>2011-01-02 20:17:53 -0500
commit1d9ade4f8bf93dd88f38daba868e7a619919a98e (patch)
tree50110b58d2a26da000c39b2f4fd4906909bf14b5
parent4066057b93030c4fc83cf38e1f2e61aa686c4b64 (diff)
downloadpyramid-1d9ade4f8bf93dd88f38daba868e7a619919a98e.tar.gz
pyramid-1d9ade4f8bf93dd88f38daba868e7a619919a98e.tar.bz2
pyramid-1d9ade4f8bf93dd88f38daba868e7a619919a98e.zip
- Allow ``decorator=`` and ``view_mapper`` parameters to add_view and
``@view_config``.
-rw-r--r--pyramid/tests/test_view.py4
-rw-r--r--pyramid/view.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/pyramid/tests/test_view.py b/pyramid/tests/test_view.py
index 69d74ee6e..33c2b606d 100644
--- a/pyramid/tests/test_view.py
+++ b/pyramid/tests/test_view.py
@@ -229,12 +229,14 @@ class TestViewConfigDecorator(unittest.TestCase):
def test_create_nondefaults(self):
decorator = self._makeOne(name=None, request_type=None, for_=None,
- permission='foo', view_mapper='mapper')
+ permission='foo', view_mapper='mapper',
+ decorator='decorator')
self.assertEqual(decorator.name, None)
self.assertEqual(decorator.request_type, None)
self.assertEqual(decorator.context, None)
self.assertEqual(decorator.permission, 'foo')
self.assertEqual(decorator.view_mapper, 'mapper')
+ self.assertEqual(decorator.decorator, 'decorator')
def test_call_function(self):
decorator = self._makeOne()
diff --git a/pyramid/view.py b/pyramid/view.py
index 8f201f6d1..afd1c6d49 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -383,7 +383,8 @@ class view_config(object):
route_name=None, request_method=None, request_param=None,
containment=None, attr=None, renderer=None, wrapper=None,
xhr=False, accept=None, header=None, path_info=None,
- custom_predicates=(), context=None, view_mapper=None):
+ custom_predicates=(), context=None, decorator=None,
+ view_mapper=None):
self.name = name
self.request_type = request_type
self.context = context or for_
@@ -400,6 +401,7 @@ class view_config(object):
self.header = header
self.path_info = path_info
self.custom_predicates = custom_predicates
+ self.decorator = decorator
self.view_mapper = view_mapper
def __call__(self, wrapped):