Ticket #3370: mysql-utf8-complete.2.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

@@ -98 +98 @@
                 kwargs['port'] = int(settings.DATABASE_PORT)
             kwargs.update(self.options)
             self.connection = Database.connect(**kwargs)
+            if self.connection.get_server_info() >= '4.1':
+                self.connection.charset = 'utf8'
             cursor = self.connection.cursor()
             if self.connection.get_server_info() >= '4.1':
                 cursor.execute("SET NAMES 'utf8'")