[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c6cd0fa2f160ecc817f9d0525599856c9ac760c8
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 03:38:51 2010 +0000

    2010-10-05  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Adler.
    
            fix the link to the expected image on windows
            https://bugs.webkit.org/show_bug.cgi?id=47228
    
            * Scripts/webkitpy/layout_tests/test_types/test_type_base.py: On
                windows, the file must be opened in binary mode when writing
                binary data.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f481262..266a515 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-05  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        fix the link to the expected image on windows
+        https://bugs.webkit.org/show_bug.cgi?id=47228
+
+        * Scripts/webkitpy/layout_tests/test_types/test_type_base.py: On
+            windows, the file must be opened in binary mode when writing
+            binary data.
+
 2010-10-05  Adam Barth  <abarth at webkit.org>
 
         Update expected result of unittest to match Tony's change below.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
index 3a6e92b..dcc64a3 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
@@ -161,7 +161,10 @@ class TestTypeBase(object):
     def _write_into_file_at_path(self, file_path, contents, encoding):
         """This method assumes that byte_array is already encoded
         into the right format."""
-        with codecs.open(file_path, "w", encoding=encoding) as file:
+        open_mode = 'w'
+        if encoding is None:
+            open_mode = 'w+b'
+        with codecs.open(file_path, open_mode, encoding=encoding) as file:
             file.write(contents)
 
     def write_output_files(self, filename, file_type,

-- 
WebKit Debian packaging