Victor Stinner avatar Victor Stinner committed 5cfeee8

makeUnicode() works better an pseudo-unicode exception

Comments (0)

Files changed (1)

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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.