diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-07 20:38:20 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-07 20:38:20 -0400 |
| commit | deb32f2a8aa996187645bad897051ebe27741d52 (patch) | |
| tree | 569d8a2d94fc3ea24369583088a905cb6e239ecc | |
| parent | 32859f733794556e339ea2779b03894e570e0336 (diff) | |
| download | pyramid-deb32f2a8aa996187645bad897051ebe27741d52.tar.gz pyramid-deb32f2a8aa996187645bad897051ebe27741d52.tar.bz2 pyramid-deb32f2a8aa996187645bad897051ebe27741d52.zip | |
more tests
| -rw-r--r-- | pyramid/config.py | 7 | ||||
| -rw-r--r-- | pyramid/tests/test_config.py | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pyramid/config.py b/pyramid/config.py index 184c0c6e8..ddf87c043 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -2942,10 +2942,9 @@ class ViewDeriver(object): result = view(context, request) response = registry.queryAdapterOrSelf(result, IResponse) if response is None: - if response is None: - raise ValueError( - 'Could not convert view return value "%s" into a ' - 'response object' % (result,)) + raise ValueError( + 'Could not convert view return value "%s" into a ' + 'response object' % (result,)) return response return wrapper diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py index 0b178d22e..255dd4b6e 100644 --- a/pyramid/tests/test_config.py +++ b/pyramid/tests/test_config.py @@ -3981,7 +3981,8 @@ class TestViewDeriver(unittest.TestCase): def outer_view(context, request): self.assertEqual(request.wrapped_response, inner_response) self.assertEqual(request.wrapped_body, inner_response.body) - self.assertEqual(request.wrapped_view, inner_view) + self.assertEqual(request.wrapped_view.__original_view__, + inner_view) return Response('outer ' + request.wrapped_body) self.config.registry.registerAdapter( outer_view, (IViewClassifier, None, None), IView, 'owrap') |