Changeset 90702 in webkit

Timestamp:

Jul 10, 2011 6:59:57 PM (13 years ago)

Author:

rolandsteiner@chromium.org

Message:

Reviewed by Tony Chang.

Complete functions in filesystem.py
​https://bugs.webkit.org/show_bug.cgi?id=63528

• missing text file functions added
• functions sorted
• removed 'append' optional parameters (were unused)
• adapted filesystem_mock in the same way

• Scripts/webkitpy/common/system/filesystem.py:
• Scripts/webkitpy/common/system/filesystem_mock.py:
• Scripts/webkitpy/common/system/filesystem_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem.py (modified) (4 diffs)
• Scripts/webkitpy/common/system/filesystem_mock.py (modified) (5 diffs)
• Scripts/webkitpy/common/system/filesystem_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-11  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Complete functions in filesystem.py
+        https://bugs.webkit.org/show_bug.cgi?id=63528
+
+        - missing text file functions added
+        - functions sorted
+        - removed 'append' optional parameters (were unused)
+        - adapted filesystem_mock in the same way
+
+        * Scripts/webkitpy/common/system/filesystem.py:
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        * Scripts/webkitpy/common/system/filesystem_unittest.py:
+
 2011-07-10  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/system/filesystem.py

@@ -192 +192 @@
         return f, temp_name
 
-    def open_text_file_for_writing(self, path, append=False):
-        mode = 'w'
-        if append:
-            mode = 'a'
-        return codecs.open(path, mode, 'utf8')
-
     def open_binary_file_for_reading(self, path):
         return codecs.open(path, 'rb')
@@ -206 +200 @@
             return f.read()
 
+    def write_binary_file(self, path, contents):
+        with file(path, 'wb') as f:
+            f.write(contents)
+
+    def open_text_file_for_reading(self, path):
+        return codecs.open(path, 'r', 'utf8')
+
+    def open_text_file_for_writing(self, path):
+        return codecs.open(path, 'w', 'utf8')
+
     def read_text_file(self, path):
         """Return the contents of the file at the given path as a Unicode string.
@@ -212 +216 @@
         with codecs.open(path, 'r', 'utf8') as f:
             return f.read()
+
+    def write_text_file(self, path, contents):
+        """Write the contents to the file at the given location.
+
+        The file is written encoded as UTF-8 with no BOM."""
+        with codecs.open(path, 'w', 'utf8') as f:
+            f.write(contents)
 
     def relpath(self, path, start='.'):
@@ -253 +264 @@
         """Return (dirname + os.sep + basename, '.' + ext)"""
         return os.path.splitext(path)
-
-    def write_binary_file(self, path, contents):
-        with file(path, 'wb') as f:
-            f.write(contents)
-
-    def write_text_file(self, path, contents):
-        """Write the contents to the file at the given location.
-
-        The file is written encoded as UTF-8 with no BOM."""
-        with codecs.open(path, 'w', 'utf8') as f:
-            f.write(contents)

trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

@@ -254 +254 @@
     def open_binary_tempfile(self, suffix=''):
         path = self._mktemp(suffix)
-        return (WritableFileObject(self, path), path)
-
-    def open_text_file_for_writing(self, path, append=False):
-        return WritableFileObject(self, path, append)
-
-    def read_text_file(self, path):
-        return self.read_binary_file(path).decode('utf-8')
+        return (WritableBinaryFileObject(self, path), path)
 
     def open_binary_file_for_reading(self, path):
         if self.files[path] is None:
             self._raise_not_found(path)
-        return ReadableFileObject(self, path, self.files[path])
+        return ReadableBinaryFileObject(self, path, self.files[path])
 
     def read_binary_file(self, path):
@@ -273 +267 @@
         return self.files[path]
 
+    def write_binary_file(self, path, contents):
+        self.files[path] = contents
+        self.written_files[path] = contents
+
+    def open_text_file_for_reading(self, path):
+        if self.files[path] is None:
+            self._raise_not_found(path)
+        return ReadableTextFileObject(self, path)
+
+    def open_text_file_for_writing(self, path):
+        return WritableTextFileObject(self, path)
+
+    def read_text_file(self, path):
+        return self.read_binary_file(path).decode('utf-8')
+
+    def write_text_file(self, path, contents):
+        return self.write_binary_file(path, contents.encode('utf-8'))
+
     def relpath(self, path, start='.'):
         return ospath.relpath(path, start, self.abspath, self.sep)
@@ -303 +315 @@
         return (path[0:idx], path[idx:])
 
-    def write_text_file(self, path, contents):
-        return self.write_binary_file(path, contents.encode('utf-8'))
-
-    def write_binary_file(self, path, contents):
-        self.files[path] = contents
-        self.written_files[path] = contents
-
-
-class WritableFileObject(object):
-    def __init__(self, fs, path, append=False, encoding=None):
+
+class WritableBinaryFileObject(object):
+    def __init__(self, fs, path):
         self.fs = fs
         self.path = path
         self.closed = False
-        if path not in self.fs.files or not append:
-            self.fs.files[path] = ""
+        self.fs.files[path] = ""
 
     def __enter__(self):
@@ -333 +337 @@
 
 
-class ReadableFileObject(object):
+class WritableTextFileObject(WritableBinaryFileObject):
+    def write(self, str):
+        WritableBinaryFileObject.write(self, str.encode('utf-8'))
+
+
+class ReadableBinaryFileObject(object):
     def __init__(self, fs, path, data=""):
         self.fs = fs
@@ -356 +365 @@
         self.offset += bytes
         return self.data[start:self.offset]
+
+
+class ReadableTextFileObject(ReadableBinaryFileObject):
+    def read(self, bytes=None):
+        return ReadableBinaryFileObject.read(self, bytes).decode('utf-8')

trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py

@@ -143 +143 @@
                 os.rmdir(sub_dir)
 
+    def test_read_and_write_text_file(self):
+        fs = FileSystem()
+        text_path = None
+
+        unicode_text_string = u'\u016An\u012Dc\u014Dde\u033D'
+        hex_equivalent = '\xC5\xAA\x6E\xC4\xAD\x63\xC5\x8D\x64\x65\xCC\xBD'
+        try:
+            text_path = tempfile.mktemp(prefix='tree_unittest_')
+            file = fs.open_text_file_for_writing(text_path)
+            file.write(unicode_text_string)
+            file.close()
+
+            file = fs.open_text_file_for_reading(text_path)
+            read_text = file.read()
+            file.close()
+
+            self.assertEqual(read_text, unicode_text_string)
+        finally:
+            if text_path and fs.isfile(text_path):
+                os.remove(text_path)
+
     def test_read_and_write_file(self):
         fs = FileSystem()
@@ -148 +169 @@
         binary_path = None
 
-        unicode_text_string = u'Ūnĭcōde̽'
+        unicode_text_string = u'\u016An\u012Dc\u014Dde\u033D'
         hex_equivalent = '\xC5\xAA\x6E\xC4\xAD\x63\xC5\x8D\x64\x65\xCC\xBD'
         try: