diff options
| -rw-r--r-- | CHANGES.txt | 5 | ||||
| -rw-r--r-- | pyramid/tests/test_wsgi.py | 16 |
2 files changed, 3 insertions, 18 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 2761c29dc..c14939d81 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,8 +10,9 @@ Next release introspectable but not when passed for registration. This would mean that add_route_predicate for example can not take a string and turn it into the actual callable function. -- p.wsgi.wsgiapp and p.wsgi.wsgiapp2 now raise ValueError when accidentally - passed None. + +- ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise + ``ValueError`` when accidentally passed ``None``. 1.5 (2014-04-08) ================ diff --git a/pyramid/tests/test_wsgi.py b/pyramid/tests/test_wsgi.py index 432fb72ae..4ddbc9201 100644 --- a/pyramid/tests/test_wsgi.py +++ b/pyramid/tests/test_wsgi.py @@ -8,14 +8,6 @@ class WSGIAppTests(unittest.TestCase): def test_wsgiapp_none(self): self.assertRaises(ValueError, self._callFUT, None) - def test_wsgiapp_none_func(self): - from pyramid.wsgi import wsgiapp - - def some_func(): - pass - - self.assertRaises(ValueError, wsgiapp, some_func()) - def test_decorator(self): context = DummyContext() request = DummyRequest() @@ -39,14 +31,6 @@ class WSGIApp2Tests(unittest.TestCase): def test_wsgiapp2_none(self): self.assertRaises(ValueError, self._callFUT, None) - def test_wsgiapp2_none_func(self): - from pyramid.wsgi import wsgiapp2 - - def some_func(): - pass - - self.assertRaises(ValueError, wsgiapp2, some_func()) - def test_decorator_with_subpath_and_view_name(self): context = DummyContext() request = DummyRequest() |