diff options
| author | roboslone <roboslone@yandex-team.ru> | 2016-12-27 07:29:31 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-12-27 14:42:58 -0500 |
| commit | 544b2ef29f0f2577912f88cf746ae0ca5877b5f8 (patch) | |
| tree | 435ae5667e04463cb7d444c5a30ce18a8c893264 /django | |
| parent | 4701abd56e382bca72d4ff8e0b015948c9ab3feb (diff) | |
Fixed #27640 -- Fixed HttpResponse's __repr__() without a 'Content-Type' header.
Diffstat (limited to 'django')
| -rw-r--r-- | django/http/response.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/django/http/response.py b/django/http/response.py index 48b4b525b9..e9e283e840 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -107,6 +107,10 @@ class HttpResponseBase(six.Iterator): else: __str__ = serialize_headers + @property + def _content_type_for_repr(self): + return ', "%s"' % self['Content-Type'] if 'Content-Type' in self else '' + def _convert_to_charset(self, value, charset, mime_encode=False): """Converts headers key/value to ascii/latin-1 native strings. @@ -299,10 +303,10 @@ class HttpResponse(HttpResponseBase): self.content = content def __repr__(self): - return '<%(cls)s status_code=%(status_code)d, "%(content_type)s">' % { + return '<%(cls)s status_code=%(status_code)d%(content_type)s>' % { 'cls': self.__class__.__name__, 'status_code': self.status_code, - 'content_type': self['Content-Type'], + 'content_type': self._content_type_for_repr, } def serialize(self): @@ -429,10 +433,10 @@ class HttpResponseRedirectBase(HttpResponse): url = property(lambda self: self['Location']) def __repr__(self): - return '<%(cls)s status_code=%(status_code)d, "%(content_type)s", url="%(url)s">' % { + return '<%(cls)s status_code=%(status_code)d%(content_type)s, url="%(url)s">' % { 'cls': self.__class__.__name__, 'status_code': self.status_code, - 'content_type': self['Content-Type'], + 'content_type': self._content_type_for_repr, 'url': self.url, } @@ -479,10 +483,10 @@ class HttpResponseNotAllowed(HttpResponse): self['Allow'] = ', '.join(permitted_methods) def __repr__(self): - return '<%(cls)s [%(methods)s] status_code=%(status_code)d, "%(content_type)s">' % { + return '<%(cls)s [%(methods)s] status_code=%(status_code)d%(content_type)s>' % { 'cls': self.__class__.__name__, 'status_code': self.status_code, - 'content_type': self['Content-Type'], + 'content_type': self._content_type_for_repr, 'methods': self['Allow'], } |
