diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-07-29 22:24:21 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-07-29 22:24:21 -0600 |
| commit | 451bf7b75bcbed8e2311d624767bff10d0325a5d (patch) | |
| tree | fd4f0601eeecc85109f66a1e15af0b7b8de41782 | |
| parent | fb1a2ff15f6293497e6cb63912c7627b4a01996e (diff) | |
| download | webob-fix/charset_handling.tar.gz | |
Don't set charset if already setfix/charset_handling
The charset provided to the constructor should not be used if a charset
is already set on the Content-Type.
| -rw-r--r-- | webob/response.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webob/response.py b/webob/response.py index 77d8b39..2dd98ff 100644 --- a/webob/response.py +++ b/webob/response.py @@ -234,7 +234,7 @@ class Response(object): # allows for a charset. if self.content_type: - if charset is not _marker: + if not self.charset and charset is not _marker: self.charset = charset elif not self.charset and self.default_charset: if _content_type_has_charset(self.content_type): |