Changeset 82999 in webkit

Timestamp:

Apr 5, 2011 4:54:34 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-05 Adam Barth <​abarth@webkit.org>

Reviewed by Tony Chang.

Don't use Exception.message because it's deprecated
​https://bugs.webkit.org/show_bug.cgi?id=57892

Suppress the warning for now. When we move to Python 3, we might need
to something more dramatic.

• Scripts/webkitpy/common/system/executive.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-05  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Tony Chang.
+
+        Don't use Exception.message because it's deprecated
+        https://bugs.webkit.org/show_bug.cgi?id=57892
+
+        Suppress the warning for now.  When we move to Python 3, we might need
+        to something more dramatic.
+
+        * Scripts/webkitpy/common/system/executive.py:
+
 2011-04-05  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/system/executive.py

@@ -44 +44 @@
 import sys
 import time
+import warnings
 
 from webkitpy.common.system.deprecated_logging import tee
@@ -83 +84 @@
 
     def __str__(self):
-        if self.output:
-            return self.message + "\n" + self.output
-        return self.message
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            if self.output:
+                return self.message + "\n" + self.output
+            return self.message
 
     def message_with_output(self, output_limit=500):