Ticket #16926: 16926-fix-custom_sql_for_model.patch

django/core/management/sql.py

@@ -168 +168 @@
                  os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
     for sql_file in sql_files:
         if os.path.exists(sql_file):
-            fp = open(sql_file, 'rbU')
-            for statement in statements.split(fp.read().decode(settings.FILE_CHARSET)):
+            # First try opening the file Python3 style.
+            # The encoding parameter is only available in Python3.
+            # If that fails open it in the traditional 2.x style and decode the
+            # result.
+            try:
+                fp = open(sql_file, 'r', encoding=settings.FILE_CHARSET)
+                sql_data = fp.read()
+            except TypeError:
+                fp = open(sql_file, 'rU')
+                sql_data = fp.read().decode(settings.FILE_CHARSET)
+
+            for statement in statements.split(sql_data):
                 # Remove any comments from the file
                 statement = re.sub(ur"--.*([\n\Z]|$)", "", statement)
                 if statement.strip():