Ticket #3370: mysql-utf8-complete.3.patch

django/db/models/base.py

@@ -77 +77 @@
         return getattr(self, self._meta.pk.attname)
 
     def __repr__(self):
-        return '<%s: %s>' % (self.__class__.__name__, self)
+        try:
+            return '<%s: %s>' % (self.__class__.__name__, self)
+        except UnicodeEncodeError:
+            return '<%s: %s>' % (self.__class__.__name__, self.__str__().encode(settings.DEFAULT_CHARSET))
 
     def __str__(self):
         return '%s object' % self.__class__.__name__

django/db/backends/mysql/base.py

@@ -89 +89 @@
                 'db': settings.DATABASE_NAME,
                 'passwd': settings.DATABASE_PASSWORD,
                 'conv': django_conversions,
+                'charset': 'utf8'
             }
             if settings.DATABASE_HOST.startswith('/'):
                 kwargs['unix_socket'] = settings.DATABASE_HOST