summaryrefslogtreecommitdiff
path: root/webob/response.py
diff options
context:
space:
mode:
Diffstat (limited to 'webob/response.py')
-rw-r--r--webob/response.py2
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):