diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-15 09:24:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-15 09:24:16 -0400 |
| commit | 4edda0d6d875ee0e7bc0375e4b314d78b1261f0e (patch) | |
| tree | 5ccb8182c2657ccc4f518379fd7b7b13d0221f86 | |
| parent | ed652182eacf9eb274817905bbfb2041d704f194 (diff) | |
| parent | aa2b903f43b4023e29ca61c21fc3a02ace61c97e (diff) | |
| download | pyramid-4edda0d6d875ee0e7bc0375e4b314d78b1261f0e.tar.gz pyramid-4edda0d6d875ee0e7bc0375e4b314d78b1261f0e.tar.bz2 pyramid-4edda0d6d875ee0e7bc0375e4b314d78b1261f0e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_router.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index a45ebae32..54d3fc4ff 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -11,7 +11,7 @@ View Configuration single: view lookup :term:`View lookup` is the :app:`Pyramid` subsystem responsible for finding -an invoking a :term:`view callable`. :term:`View configuration` controls how +and invoking a :term:`view callable`. :term:`View configuration` controls how :term:`view lookup` operates in your application. During any given request, view configuration information is compared against request data by the view lookup subsystem in order to find the "best" view callable for that request. diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py index 6cd86901e..55eed50f5 100644 --- a/pyramid/tests/test_router.py +++ b/pyramid/tests/test_router.py @@ -418,7 +418,7 @@ class TestRouter(unittest.TestCase): request.response.a = 1 raise KeyError def exc_view(context, request): - self.failIf(hasattr(request.response, 'a')) + self.assertFalse(hasattr(request.response, 'a')) request.response.body = 'OK' return request.response environ = self._makeEnviron() |