Commits

Victor Stinner  committed 5cfeee8

makeUnicode() works better an pseudo-unicode exception

  • Participants
  • Parent commits 67c811f

Comments (0)

Files changed (1)

File hachoir-core/hachoir_core/tools.py

     if isinstance(text, str):
         text = unicode(text, "ISO-8859-1")
     elif not isinstance(text, unicode):
-        text = unicode(text)
+        try:
+            text = unicode(text)
+        except UnicodeError:
+            try:
+                text = str(text)
+            except Exception:
+                text = repr(text)
+            return makeUnicode(text)
     text = regex_control_code.sub(
         lambda regs: controlchars[ord(regs.group(1))], text)
     text = re.sub(r"\\x0([0-7])(?=[^0-7]|$)", r"\\\1", text)