Ticket #5028: utils_encoding_repr.diff

utils/encoding.py

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