From d9ea462264e7dfc9f225b2b8b53007d6f1dacd04 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 17 Aug 2011 11:59:59 -0400 Subject: 1.1 bw compat: dont choke trying to preserve view attrs if the view is None --- pyramid/config/views.py | 3 +++ pyramid/tests/test_config/test_views.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/pyramid/config/views.py b/pyramid/config/views.py index b7ae48525..b2047a53b 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -45,6 +45,9 @@ def wraps_view(wrapper): return inner def preserve_view_attrs(view, wrapper): + if view is None: + return wrapper + if wrapper is view: return view diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py index 792b96802..aa5b8d2d6 100644 --- a/pyramid/tests/test_config/test_views.py +++ b/pyramid/tests/test_config/test_views.py @@ -1537,6 +1537,12 @@ class Test_preserve_view_attrs(unittest.TestCase): result = self._callFUT(view, view) self.assertTrue(result is view) + def test_it_view_is_None(self): + def view(context, request): + """ """ + result = self._callFUT(None, view) + self.assertTrue(result is view) + def test_it_different_with_existing_original_view(self): def view1(context, request): pass view1.__original_view__ = 'abc' -- cgit v1.2.3