Ticket #440: 440.3.patch

django/utils/httpwrappers.py

@@ -1 +1 @@
 from Cookie import SimpleCookie
 from pprint import pformat
 import datastructures
+from django.conf import settings
 
 DEFAULT_MIME_TYPE = 'text/html'
 
@@ -131 +132 @@
     "A basic HTTP response, with content and dictionary-accessed headers"
     def __init__(self, content='', mimetype=DEFAULT_MIME_TYPE):
         self.content = content
-        self.headers = {'Content-Type':mimetype}
+        if mimetype == DEFAULT_MIME_TYPE:
+            contenttype = mimetype + '; charset=' + settings.DEFAULT_CHARSET
+        else:
+            contenttype = mimetype
+        self.headers = {'Content-Type':contenttype}
         self.cookies = SimpleCookie()
         self.status_code = 200
 

django/conf/project_template/settings/main.py

@@ -9 +9 @@
 MANAGERS = ADMINS
 
 LANGUAGE_CODE = 'en-us'
+DEFAULT_CHARSET = 'utf-8'
 
 DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', or 'sqlite3'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.

django/conf/settings.py

@@ -50 +50 @@
 # move the time zone info into os.environ
 os.environ['TZ'] = me.TIME_ZONE
 
+# if charset is not set, use utf-8
+if not hasattr(me, 'DEFAULT_CHARSET'):
+    me.DEFAULT_CHARSET='utf-8'
+
 # finally, clean up my namespace
 for k in dir(me):
     if not k.startswith('_') and k != 'me' and k != k.upper():

django/core/formfields.py

@@ -2 +2 @@
 from django.core.exceptions import PermissionDenied
 from django.utils.html import escape
 from django.utils.text import fix_microsoft_characters
+from django.conf import settings
 
 FORM_FIELD_ID_PREFIX = 'id_'
 
@@ -222 +223 @@
         self.validator_list = [self.isValidLength, self.hasNoNewlines] + validator_list
 
     def isValidLength(self, data, form):
-        if data and self.maxlength and len(data) > self.maxlength:
+        if data and self.maxlength and len(data.decode(settings.DEFAULT_CHARSET)) > self.maxlength:
             raise validators.ValidationError, "Ensure your text is less than %s characters." % self.maxlength
 
     def hasNoNewlines(self, data, form):