Index: Tools/Scripts/webkitpy/test/printer.py |
diff --git a/Tools/Scripts/webkitpy/test/printer.py b/Tools/Scripts/webkitpy/test/printer.py |
index 83f097890259091a99b11fbf60ff9def03e30d4e..24d55348b3ecda543c76180e0aab4c68aa7d7c45 100644 |
--- a/Tools/Scripts/webkitpy/test/printer.py |
+++ b/Tools/Scripts/webkitpy/test/printer.py |
@@ -21,9 +21,10 @@ |
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-import logging |
import StringIO |
+import logging |
+from webkitpy.common.system import outputcapture |
from webkitpy.common.system.systemhost import SystemHost |
from webkitpy.layout_tests.views.metered_stream import MeteredStream |
@@ -102,8 +103,6 @@ class Printer(object): |
handler.addFilter(testing_filter) |
if self.options.pass_through: |
- # FIXME: Can't import at top of file, as outputcapture needs unittest2 |
- from webkitpy.common.system import outputcapture |
outputcapture.OutputCapture.stream_wrapper = _CaptureAndPassThroughStream |
def write_update(self, msg): |