diff options
| -rw-r--r-- | docs/narr/testing.rst | 4 | ||||
| -rw-r--r-- | pyramid/config/__init__.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst index 0d0e292bf..ec5952a7c 100644 --- a/docs/narr/testing.rst +++ b/docs/narr/testing.rst @@ -373,7 +373,7 @@ after accessing some values that require a fully set up environment. result = my_view(request) self.assertEqual(result.status, '200 OK') body = result.app_iter[0] - self.failUnless('Welcome to' in body) + self.assertTrue('Welcome to' in body) self.assertEqual(len(result.headerlist), 2) self.assertEqual(result.headerlist[0], ('Content-Type', 'text/html; charset=UTF-8')) @@ -416,7 +416,7 @@ functional testing package written by Ian Bicking. def test_root(self): res = self.testapp.get('/', status=200) - self.failUnless('Pyramid' in res.body) + self.assertTrue('Pyramid' in res.body) When this test is run, each test creates a "real" WSGI application using the ``main`` function in your ``myapp.__init__`` module and uses :term:`WebTest` diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 4f7899b54..5bb9987af 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -642,7 +642,7 @@ class Configurator( argument named ``config``, which will be an instance of a :term:`Configurator`. However, be warned that it will not be the same configurator instance on which you call this method. The - code which runs as the result of calling the callable should invoke + code which runs as a result of calling the callable should invoke methods on the configurator passed to it which add configuration state. The return value of a callable will be ignored. |