diff options
| author | Michael Merickel <mmerickel@users.noreply.github.com> | 2016-12-09 23:35:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 23:35:50 -0600 |
| commit | 59aa88c400f9d29ac2e608c38d1f926341be0455 (patch) | |
| tree | 7f292a9eb761f1aebd5e0541cf13c1ff6c90e18a | |
| parent | a1281f856ab50088cb9747a40e79541ddc7faa37 (diff) | |
| parent | 2ae320a4390940014dd049d2fc5f8312a31e2961 (diff) | |
| download | pyramid-59aa88c400f9d29ac2e608c38d1f926341be0455.tar.gz pyramid-59aa88c400f9d29ac2e608c38d1f926341be0455.tar.bz2 pyramid-59aa88c400f9d29ac2e608c38d1f926341be0455.zip | |
Merge pull request #2863 from Pylons/bugfix/streaming_exceptions
Bugfix: streaming exceptions
| -rw-r--r-- | pyramid/httpexceptions.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/httpexceptions.py b/pyramid/httpexceptions.py index 054917dfa..a22b088c6 100644 --- a/pyramid/httpexceptions.py +++ b/pyramid/httpexceptions.py @@ -246,7 +246,7 @@ ${body}''') 'title': self.title} def prepare(self, environ): - if not self.body and not self.empty_body: + if not self.has_body and not self.empty_body: html_comment = '' comment = self.comment or '' accept_value = environ.get('HTTP_ACCEPT', '') @@ -41,7 +41,7 @@ except IOError: install_requires = [ 'setuptools', - 'WebOb >= 1.3.1', # request.domain and CookieProfile + 'WebOb >= 1.7.0rc2', # Response.has_body 'repoze.lru >= 0.4', # py3 compat 'zope.interface >= 3.8.0', # has zope.interface.registry 'zope.deprecation >= 3.5.0', # py3 compat |