Tools/Scripts/webkitpy/common/system/outputcapture.py - Issue 18418010: Check in the thirdparty libs needed for webkitpy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/common/system/outputcapture.py

Issue 18418010: Check in the thirdparty libs needed for webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Tools/Scripts/webkitpy/common/system/outputcapture.py

diff --git a/Tools/Scripts/webkitpy/common/system/outputcapture.py b/Tools/Scripts/webkitpy/common/system/outputcapture.py

index 893b5e52849dbf7254ac2f0c96adc45d043b6554..bf3ae9186a6410ffe744dd11c1133479d938af68 100644

--- a/Tools/Scripts/webkitpy/common/system/outputcapture.py

+++ b/Tools/Scripts/webkitpy/common/system/outputcapture.py

@@ -29,10 +29,11 @@

# Class for unittest support. Used for capturing stderr/stdout.

import logging

-import unittest # Don't use unittest2 here as the autoinstaller may not have it yet.

import sys

from StringIO import StringIO

+from webkitpy.thirdparty import unittest2 as unittest

class OutputCapture(object):

# By default we capture the output to a stream. Other modules may override