[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

eric at webkit.org eric at webkit.org
Sun Feb 20 22:56:57 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 7dcc87ad540273760ee3b2f5881f9f5b02caff59
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 09:52:38 2011 +0000

    2011-01-14  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Make it work in python 2.5.
    
            webkit-patch suggest-reviewers dies when ChangeLogs are missing
            https://bugs.webkit.org/show_bug.cgi?id=49158
    
            * Scripts/webkitpy/common/checkout/api_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 64df9a0..de06a42 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Make it work in python 2.5.
+
+        webkit-patch suggest-reviewers dies when ChangeLogs are missing
+        https://bugs.webkit.org/show_bug.cgi?id=49158
+
+        * Scripts/webkitpy/common/checkout/api_unittest.py:
+
 2011-01-14  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r75774.
diff --git a/Tools/Scripts/webkitpy/common/checkout/api_unittest.py b/Tools/Scripts/webkitpy/common/checkout/api_unittest.py
index 6275082..fdf3fba 100644
--- a/Tools/Scripts/webkitpy/common/checkout/api_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/api_unittest.py
@@ -132,7 +132,7 @@ class CheckoutTest(unittest.TestCase):
             # contents_at_revision is expected to return a byte array (str)
             # so we encode our unicode ChangeLog down to a utf-8 stream.
             # The ChangeLog utf-8 decoding should ignore invalid codepoints.
-            invalid_utf8 = str(b"\255")
+            invalid_utf8 = "\255"
             return _changelog1.encode("utf-8") + invalid_utf8
         scm.contents_at_revision = mock_contents_at_revision
         checkout = Checkout(scm)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list