1.1 bw compat: dont choke trying to preserve view attrs if the view is None

Chris McDonough

2011-08-17 d9ea462264e7dfc9f225b2b8b53007d6f1dacd04

1.1 bw compat: dont choke trying to preserve view attrs if the view is None

 pyramid/config/views.py

@@ -45,6 +45,9 @@
    return inner

def preserve_view_attrs(view, wrapper):
    if view is None:
        return wrapper

    if wrapper is view:
        return view


 pyramid/tests/test_config/test_views.py

@@ -1537,6 +1537,12 @@
        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'