diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-03-31 06:15:13 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-03-31 06:15:13 +0000 |
| commit | 2c100e84a36c8ac5fac0684b201ce2050ba1aab0 (patch) | |
| tree | 3fc30f1d2f27cdf365e7bb1185c3397151ba4e7f | |
| parent | 9d93702e1cdf8806bbc29e2079cc76cbbf114afd (diff) | |
| download | pyramid-2c100e84a36c8ac5fac0684b201ce2050ba1aab0.tar.gz pyramid-2c100e84a36c8ac5fac0684b201ce2050ba1aab0.tar.bz2 pyramid-2c100e84a36c8ac5fac0684b201ce2050ba1aab0.zip | |
- Fix a bug in ``repoze.bfg.wsgi.HTTPException``: the content length
was returned as an int rather than as a string.
| -rw-r--r-- | CHANGES.txt | 11 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_wsgi.py | 8 | ||||
| -rw-r--r-- | repoze/bfg/wsgi.py | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 2be49e6a0..5c556eaec 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Next release ============ +Bug Fixes +--------- + +- Fix a bug in ``repoze.bfg.wsgi.HTTPException``: the content length + was returned as an int rather than as a string. + - Add explicit dependencies on ``zope.deferredimport``, ``zope.deprecation``, and ``zope.proxy`` for forward compatibility reasons (``zope.component`` will stop relying on @@ -18,9 +24,12 @@ Next release empty string, and, as a result, the error won't be raised. Of course the URL or path will still be bogus. +Features +-------- + - Make it possible to have ``testing.DummyTemplateRenderer`` return some nondefault string representation. - + 0.6.9 (2009-02-16) ================== diff --git a/repoze/bfg/tests/test_wsgi.py b/repoze/bfg/tests/test_wsgi.py index 95eaecf80..1fd2393b8 100644 --- a/repoze/bfg/tests/test_wsgi.py +++ b/repoze/bfg/tests/test_wsgi.py @@ -30,7 +30,7 @@ class TestNotFound(unittest.TestCase): self.assertEqual(len(result), 1) self.failUnless('404 Not Found' in result[0]) self.assertEqual(L[0][0], '404 Not Found') - self.assertEqual(L[0][1], [('Content-Length', len(result[0])), + self.assertEqual(L[0][1], [('Content-Length', str(len(result[0]))), ('Content-Type', 'text/html')]) def test_with_message(self): @@ -44,7 +44,7 @@ class TestNotFound(unittest.TestCase): self.failUnless('404 Not Found' in result[0]) self.failUnless('<hi!>' in result[0]) self.assertEqual(L[0][0], '404 Not Found') - self.assertEqual(L[0][1], [('Content-Length', len(result[0])), + self.assertEqual(L[0][1], [('Content-Length', str(len(result[0]))), ('Content-Type', 'text/html')]) class TestUnauthorized(unittest.TestCase): @@ -65,7 +65,7 @@ class TestUnauthorized(unittest.TestCase): self.assertEqual(len(result), 1) self.failUnless('401 Unauthorized' in result[0]) self.assertEqual(L[0][0], '401 Unauthorized') - self.assertEqual(L[0][1], [('Content-Length', len(result[0])), + self.assertEqual(L[0][1], [('Content-Length', str(len(result[0]))), ('Content-Type', 'text/html')]) def test_with_message(self): @@ -79,7 +79,7 @@ class TestUnauthorized(unittest.TestCase): self.failUnless('401 Unauthorized' in result[0]) self.failUnless('<hi!>' in result[0]) self.assertEqual(L[0][0], '401 Unauthorized') - self.assertEqual(L[0][1], [('Content-Length', len(result[0])), + self.assertEqual(L[0][1], [('Content-Length', str(len(result[0]))), ('Content-Type', 'text/html')]) def dummyapp(environ, start_response): diff --git a/repoze/bfg/wsgi.py b/repoze/bfg/wsgi.py index 1a2c0460b..667de4412 100644 --- a/repoze/bfg/wsgi.py +++ b/repoze/bfg/wsgi.py @@ -44,7 +44,8 @@ class HTTPException(object): <html><title>%s</title><body><h1>%s</h1> <code>%s</code> """ % (self.status, self.status, msg) - headers = [('Content-Length', len(html)), ('Content-Type', 'text/html')] + headers = [('Content-Length', str(len(html))), + ('Content-Type', 'text/html')] start_response(self.status, headers) return [html] |