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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 429364f82f53176009b44a8e5565a28f0f873c7c
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 02:32:09 2010 +0000

    2010-10-18  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Eric Seidel.
    
            new-run-webkit-tests produces corrupt PNG baselines on Windows
            https://bugs.webkit.org/show_bug.cgi?id=47867
    
            * Scripts/webkitpy/layout_tests/port/base.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 60cfe11..65d4caa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-18  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests produces corrupt PNG baselines on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=47867
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2010-10-18  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 96360e7..cd7d663 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -397,7 +397,10 @@ class Port(object):
             data: contents of the baseline.
             encoding: file encoding to use for the baseline.
         """
-        with codecs.open(path, "w", encoding=encoding) as file:
+        write_mode = "w"
+        if encoding is None:
+            write_mode = "wb"
+        with codecs.open(path, write_mode, encoding=encoding) as file:
             file.write(data)
 
     def uri_to_test_name(self, uri):

-- 
WebKit Debian packaging