Ticket #4021: 4021.diff

django/conf/global_settings.py

@@ -95 +95 @@
 DEFAULT_CONTENT_TYPE = 'text/html'
 DEFAULT_CHARSET = 'utf-8'
 
+# Charset of template files and initial sql files
+FILE_CHARSET = 'utf-8'
+
 # E-mail address that error messages come from.
 SERVER_EMAIL = 'root@localhost'
 

django/core/management.py

@@ -545 +545 @@
                         print "Installing custom SQL for %s.%s model" % (app_name, model._meta.object_name)
                     try:
                         for sql in custom_sql:
-                            cursor.execute(sql)
+                            cursor.execute(sql.decode(settings.FILE_CHARSET))
                     except Exception, e:
                         sys.stderr.write("Failed to install custom SQL for %s.%s model: %s" % \
                                             (app_name, model._meta.object_name, e))
@@ -655 +655 @@
         try:
             cursor = connection.cursor()
             for sql in sql_list:
-                cursor.execute(sql)
+                cursor.execute(sql.decode(settings.FILE_CHARSET))
         except Exception, e:
             sys.stderr.write(style.ERROR("""Error: %s couldn't be reset. Possible reasons:
   * The database isn't running or isn't configured correctly.
@@ -707 +707 @@
         try:
             cursor = connection.cursor()
             for sql in sql_list:
-                cursor.execute(sql)
+                cursor.execute(sql.decode(settings.FILE_CHARSET))
         except Exception, e:
             sys.stderr.write(style.ERROR("""Error: Database %s couldn't be flushed. Possible reasons:
   * The database isn't running or isn't configured correctly.

django/template/loaders/app_directories.py

@@ -34 +34 @@
 def load_template_source(template_name, template_dirs=None):
     for filepath in get_template_sources(template_name, template_dirs):
         try:
-            return (open(filepath).read(), filepath)
+            return (open(filepath).read().decode(settings.FILE_CHARSET), filepath)
         except IOError:
             pass
     raise TemplateDoesNotExist, template_name

django/template/loaders/filesystem.py

@@ -14 +14 @@
     tried = []
     for filepath in get_template_sources(template_name, template_dirs):
         try:
-            return (open(filepath).read(), filepath)
+            return (open(filepath).read().decode(settings.FILE_CHARSET), filepath)
         except IOError:
             tried.append(filepath)
     if tried:

django/template/loaders/eggs.py

@@ -18 +18 @@
         pkg_name = 'templates/' + template_name
         for app in settings.INSTALLED_APPS:
             try:
-                return (resource_string(app, pkg_name), 'egg:%s:%s ' % (app, pkg_name))
+                return (resource_string(app, pkg_name), 'egg:%s:%s ' % (app, pkg_name)).decode(settings.FILE_CHARSET)
             except:
                 pass
     raise TemplateDoesNotExist, template_name