From bfc380baeaca359ac7b36eb35a2415e6a37e836c Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 20 Aug 2012 10:46:21 +0200
Subject: [PATCH] [py3] Prepared MySQL backend for Python 3 compatibility

---
 django/db/backends/mysql/compiler.py      | 8 +++++++-
 django/db/backends/mysql/introspection.py | 7 ++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/django/db/backends/mysql/compiler.py b/django/db/backends/mysql/compiler.py
index 012bca5da69..d8e9b3a202a 100644
--- a/django/db/backends/mysql/compiler.py
+++ b/django/db/backends/mysql/compiler.py
@@ -1,10 +1,16 @@
+try:
+    from itertools import zip_longest
+except ImportError:
+    from itertools import izip_longest as zip_longest
+
 from django.db.models.sql import compiler
 
+
 class SQLCompiler(compiler.SQLCompiler):
     def resolve_columns(self, row, fields=()):
         values = []
         index_extra_select = len(self.query.extra_select)
-        for value, field in map(None, row[index_extra_select:], fields):
+        for value, field in zip_longest(row[index_extra_select:], fields):
             if (field and field.get_internal_type() in ("BooleanField", "NullBooleanField") and
                 value in (0, 1)):
                 value = bool(value)
diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py
index 6aab0b99ab0..041fbee1b24 100644
--- a/django/db/backends/mysql/introspection.py
+++ b/django/db/backends/mysql/introspection.py
@@ -1,8 +1,9 @@
+import re
+from .base import FIELD_TYPE
+
 from django.db.backends import BaseDatabaseIntrospection
 from django.utils import six
-from MySQLdb import ProgrammingError, OperationalError
-from MySQLdb.constants import FIELD_TYPE
-import re
+
 
 foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)")