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

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fbf497a7dae403ac57a6732f882190e42c9ffc6e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 05:53:35 2010 +0000

    2010-08-24  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            unicode(Exception(\u"0x1234")) is busted in python 2.5, disable tests which hit this
            https://bugs.webkit.org/show_bug.cgi?id=44584
    
            * Scripts/webkitpy/tool/commands/queues_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4227b7e..03d80e7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        unicode(Exception(\u"0x1234")) is busted in python 2.5, disable tests which hit this
+        https://bugs.webkit.org/show_bug.cgi?id=44584
+
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
+2010-08-24  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         commit-queue and EWS bots should report all failures
         https://bugs.webkit.org/show_bug.cgi?id=41820
 
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
index 99f386e..d729d98 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -105,6 +105,12 @@ class AbstractQueueTest(CommandsTest):
 
     def test_log_from_script_error_for_upload(self):
         self._assert_log_message(ScriptError("test"), "test")
+        # In python 2.5 unicode(Exception) is busted. See:
+        # http://bugs.python.org/issue2517
+        # With no good workaround, we just ignore these tests.
+        if not hasattr(Exception, "__unicode__"):
+            return
+
         unicode_tor = u"WebKit \u2661 Tor Arne Vestb\u00F8!"
         utf8_tor = unicode_tor.encode("utf-8")
         self._assert_log_message(ScriptError(unicode_tor), utf8_tor)

-- 
WebKit Debian packaging