From 05c2cd15d0305bd58b13509ce773bef7ba0fcbf6 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 11 Jul 2017 16:12:53 +0000 Subject: [PATCH] [lit] Fix import StringIO errors in Python 3 Remove the cStringIO micro-optimization, as it isn't portable to Python 3. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307669 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lit/lit/TestRunner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index f80360491b8..8260d381334 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -6,9 +6,9 @@ import tempfile import threading try: - import cStringIO as StringIO + from StringIO import StringIO except ImportError: - import StringIO + from io import StringIO from lit.ShCommands import GlobItem import lit.ShUtil as ShUtil @@ -240,7 +240,7 @@ def executeBuiltinEcho(cmd, shenv): is_redirected = True if stdout == subprocess.PIPE: is_redirected = False - stdout = StringIO.StringIO() + stdout = StringIO() elif kIsWindows: # Reopen stdout in binary mode to avoid CRLF translation. The versions # of echo we are replacing on Windows all emit plain LF, and the LLVM -- 2.40.0