Anonymous avatar Anonymous committed 85f5c63

fscommands: using utf8 if the specified encoding does not work

Comments (0)

Files changed (1)

rope/base/fscommands.py

 def _decode_data(data, encoding):
     if encoding is None:
         encoding = read_str_coding(data)
-    if encoding is not None:
-        return unicode(data, encoding)
     try:
+        if encoding is not None:
+            return unicode(data, encoding)
         return unicode(data)
-    except UnicodeDecodeError:
+    except (UnicodeDecodeError, LookupError):
         # Using ``utf-8`` if guessed encoding fails
         return unicode(data, 'utf-8')
 
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.