Commit 4d6db415 authored by abarth@webkit.org's avatar abarth@webkit.org

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:


git-svn-id: svn://svn.chromium.org/blink/trunk@82999 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b97d984b
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> 2011-04-05 Mihai Parparita <mihaip@chromium.org>
Reviewed by Ojan Vafai. Reviewed by Ojan Vafai.
......
...@@ -43,6 +43,7 @@ import signal ...@@ -43,6 +43,7 @@ import signal
import subprocess import subprocess
import sys import sys
import time import time
import warnings
from webkitpy.common.system.deprecated_logging import tee from webkitpy.common.system.deprecated_logging import tee
from webkitpy.common.system.filesystem import FileSystem from webkitpy.common.system.filesystem import FileSystem
...@@ -82,9 +83,11 @@ class ScriptError(Exception): ...@@ -82,9 +83,11 @@ class ScriptError(Exception):
self.cwd = cwd self.cwd = cwd
def __str__(self): def __str__(self):
if self.output: with warnings.catch_warnings():
return self.message + "\n" + self.output warnings.simplefilter("ignore")
return self.message if self.output:
return self.message + "\n" + self.output
return self.message
def message_with_output(self, output_limit=500): def message_with_output(self, output_limit=500):
if self.output: if self.output:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment