Commits

Lynn Rees committed af68f9b

- tweak

Comments (0)

Files changed (1)

 def tounicode(thing, encoding='utf-8', errors='strict'):
     '''Convert string `thing` to unicode string with `encoding`.'''
     if isbytes(thing):
-        return norm(thing).decode(encoding, errors)
+        try:
+            return thing.decode(encoding, errors)
+        except UnicodeDecodeError:
+            return norm(thing).decode(encoding, errors)
     elif isunicode(thing):
-        return norm(utfme(thing)).decode(encoding, errors)
-    return utfme(utfme(thing).encode(encoding, errors), encoding, errors)
+        return thing.encode(encoding, errors).decode(encoding, errors)
+    return utfme(thing).encode(encoding, errors).decode(encoding, errors)
 
 
 def tobytes(thing, encoding='utf-8', errors='strict'):
     if isbytes(thing):
         return thing
     elif isunicode(thing):
-        return utfme(norm(thing)).encode(encoding, errors)
+        return norm(thing).encode(encoding, errors)
     return utfme(thing).encode(encoding, errors)
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.