Ticket #4773: unicode_fix.diff

django/utils/encoding.py

@@ -37 +37 @@
         if hasattr(s, '__unicode__'):
             s = unicode(s)
         else:
-            s = unicode(str(s), encoding, errors)
+            s = unicode(smart_str(s), encoding, errors)
     elif not isinstance(s, unicode):
         s = unicode(s, encoding, errors)
     return s