Anonymous avatar Anonymous committed 611db2b

fscommands: handling dos line-ending in file_data_to_unicode

Comments (0)

Files changed (2)

rope/base/fscommands.py

         return contents.encode('utf-8')
 
 def file_data_to_unicode(data, encoding=None):
+    result = _decode_data(data, encoding)
+    if '\r\n' in result:
+        return result.replace('\r\n', '\n')
+    return result
+
+def _decode_data(data, encoding):
     if encoding is None:
         encoding = read_str_coding(data)
     if encoding is not None:

rope/base/resources.py

         return rope.base.fscommands.file_data_to_unicode(data)
 
     def read_bytes(self):
-        return open(self.real_path, 'U').read()
+        return open(self.real_path, 'rb').read()
 
     def write(self, contents):
         try:
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.