Changeset 58016 in webkit

Timestamp:

Apr 21, 2010 3:51:44 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Eric Seidel <​eric@webkit.org>

Unreviewed, just fixing exception seen on builders.

REGRESSION(57531): the commit-queue still hates Tor Arne Vestbø
​https://bugs.webkit.org/show_bug.cgi?id=37765

• Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
  • Pass and encoding to _write_into_file_at_path

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/test_types/test_type_base.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed, just fixing exception seen on builders.
+
+        REGRESSION(57531): the commit-queue still hates Tor Arne Vestbø
+        https://bugs.webkit.org/show_bug.cgi?id=37765
+
+        * Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
+         - Pass and encoding to _write_into_file_at_path
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py

@@ -154 +154 @@
         raise NotImplemented
 
-    def _write_into_file_at_path(self, file_path, byte_array):
-        """This method assumes that byte_array is already encoded
-        into the right format."""
-        with open(file_path, "wb") as file:
-            file.write(byte_array)
+    def _write_into_file_at_path(self, file_path, contents, encoding=None):
+        """Writes contents at file_path, using encoding."""
+        with codecs.open(file_path, "w", encoding) as file:
+            file.write(contents)
 
     def write_output_files(self, port, filename, file_type,
@@ -180 +179 @@
         actual_filename = self.output_filename(filename, self.FILENAME_SUFFIX_ACTUAL + file_type)
         expected_filename = self.output_filename(filename, self.FILENAME_SUFFIX_EXPECTED + file_type)
+        # FIXME: The fact that this function can take many different
+        # types of data is a total hack.
+        encoding = "utf-8" if print_text_diffs else None
         if output:
-            self._write_into_file_at_path(actual_filename, output)
+            self._write_into_file_at_path(actual_filename, output, encoding)
         if expected:
-            self._write_into_file_at_path(expected_filename, expected)
+            self._write_into_file_at_path(expected_filename, expected, encoding)
 
         if not output or not expected:
@@ -193 +195 @@
         diff = port.diff_text(expected, output, expected_filename, actual_filename)
         diff_filename = self.output_filename(filename, self.FILENAME_SUFFIX_DIFF + file_type)
-        self._write_into_file_at_path(diff_filename, diff.encode("utf-8"))
+        self._write_into_file_at_path(diff_filename, diff, encoding="utf-8")
 
         # Shell out to wdiff to get colored inline diffs.
         wdiff = port.wdiff_text(expected_filename, actual_filename)
         wdiff_filename = self.output_filename(filename, self.FILENAME_SUFFIX_WDIFF)
-        self._write_into_file_at_path(wdiff_filename, wdiff.encode("utf-8"))
+        self._write_into_file_at_path(wdiff_filename, wdiff, encoding="utf-8")
 
         # Use WebKit's PrettyPatch.rb to get an HTML diff.
         pretty_patch = port.pretty_patch_text(diff_filename)
         pretty_patch_filename = self.output_filename(filename, self.FILENAME_SUFFIX_PRETTY_PATCH)
-        self._write_into_file_at_path(pretty_patch_filename, pretty_patch.encode("utf-8"))
+        self._write_into_file_at_path(pretty_patch_filename, pretty_patch, encoding="utf-8")