Remove Python 2.5 support from WebKit

https://bugs.webkit.org/show_bug.cgi?id=71593

Reviewed by Eric Seidel.

This is the last vestige of our Python 2.5 support.

* Scripts/webkitpy/tool/commands/queues_unittest.py:
(AbstractQueueTest.test_log_from_script_error_for_upload):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6f4bba7..1456888 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,17 @@
 2012-02-08  Adam Barth  <abarth@webkit.org>
 
+        Remove Python 2.5 support from WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=71593
+
+        Reviewed by Eric Seidel.
+
+        This is the last vestige of our Python 2.5 support.
+
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+        (AbstractQueueTest.test_log_from_script_error_for_upload):
+
+2012-02-08  Adam Barth  <abarth@webkit.org>
+
         version_check.py should inform users that we don't support Python 2.5 anymore
         https://bugs.webkit.org/show_bug.cgi?id=78179
 

diff --git a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
index eea8e56..8f8f198 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -118,12 +118,6 @@ 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)