summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron Ring <cam@laborapi.com>2011-10-02 02:11:22 -0700
committerCameron Ring <cam@laborapi.com>2011-10-02 02:11:22 -0700
commitbf5e0e6ef7a3ed6154d45e7b3c0080215feaec5d (patch)
tree382465a3ec1fbc9c4cba7bfbfdb01659a7e540ba
parentb1e795e320a505f9ed737a5f1466261508cfc33b (diff)
downloadpyramid-bf5e0e6ef7a3ed6154d45e7b3c0080215feaec5d.tar.gz
pyramid-bf5e0e6ef7a3ed6154d45e7b3c0080215feaec5d.tar.bz2
pyramid-bf5e0e6ef7a3ed6154d45e7b3c0080215feaec5d.zip
match_param was missing from the view_config decorator
-rw-r--r--pyramid/tests/test_view.py3
-rw-r--r--pyramid/view.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/pyramid/tests/test_view.py b/pyramid/tests/test_view.py
index 29e468cd2..1bdb066c0 100644
--- a/pyramid/tests/test_view.py
+++ b/pyramid/tests/test_view.py
@@ -276,13 +276,14 @@ class TestViewConfigDecorator(unittest.TestCase):
def test_create_nondefaults(self):
decorator = self._makeOne(name=None, request_type=None, for_=None,
permission='foo', mapper='mapper',
- decorator='decorator')
+ decorator='decorator', match_param='match_param')
self.assertEqual(decorator.name, None)
self.assertEqual(decorator.request_type, None)
self.assertEqual(decorator.context, None)
self.assertEqual(decorator.permission, 'foo')
self.assertEqual(decorator.mapper, 'mapper')
self.assertEqual(decorator.decorator, 'decorator')
+ self.assertEqual(decorator.match_param, 'match_param')
def test_call_function(self):
decorator = self._makeOne()
diff --git a/pyramid/view.py b/pyramid/view.py
index 581e42185..13d5cfe7b 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -175,7 +175,7 @@ class view_config(object):
containment=None, attr=None, renderer=None, wrapper=None,
xhr=False, accept=None, header=None, path_info=None,
custom_predicates=(), context=None, decorator=None,
- mapper=None, http_cache=None):
+ mapper=None, http_cache=None, match_param=None):
self.name = name
self.request_type = request_type
self.context = context or for_
@@ -195,6 +195,7 @@ class view_config(object):
self.decorator = decorator
self.mapper = mapper
self.http_cache = http_cache
+ self.match_param = match_param
def __call__(self, wrapped):
settings = self.__dict__.copy()