diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-03 17:42:59 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-03 17:42:59 -0400 |
| commit | e93380f06ac5cfe8e7c1c1cc5956c8a35a28cfae (patch) | |
| tree | 5bb85ca0fcac26a2b52e8b856f632503293c17ae | |
| parent | a4b82c81f41ea8900b763951d6b4b0a18b33fdb2 (diff) | |
| parent | bf5e0e6ef7a3ed6154d45e7b3c0080215feaec5d (diff) | |
| download | pyramid-e93380f06ac5cfe8e7c1c1cc5956c8a35a28cfae.tar.gz pyramid-e93380f06ac5cfe8e7c1c1cc5956c8a35a28cfae.tar.bz2 pyramid-e93380f06ac5cfe8e7c1c1cc5956c8a35a28cfae.zip | |
Merge branch 'master' of https://github.com/cameronr/pyramid into cameronr-master
| -rw-r--r-- | pyramid/tests/test_view.py | 3 | ||||
| -rw-r--r-- | pyramid/view.py | 3 |
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() |