[lit] Use .write() methods instead of print statement.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187857 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py
index c9c1454f0c67d2ed151edb49cc7c2a4f6305dd9b..8eac818a6b622a375f9c8ef8dd7267a9472b35d4 100644 (file)
--- a/utils/lit/lit/LitConfig.py
+++ b/utils/lit/lit/LitConfig.py
@@ -112,8 +112,8 @@ class LitConfig:
         file,line,_,_,_ = inspect.getframeinfo(f)
         location = '%s:%d' % (os.path.basename(file), line)
 
-        print >>sys.stderr, '%s: %s: %s: %s' % (self.progname, location,
-                                                kind, message)
+        sys.stderr.write('%s: %s: %s: %s\n' % (self.progname, location,
+                                               kind, message))
 
     def note(self, message):
         self._write_message('note', message)

diff --git a/utils/lit/lit/ProgressBar.py b/utils/lit/lit/ProgressBar.py
index 5c85a175c5caa900d690f0820f06f94c4a093600..0454ba29a43e9676c3aafa6863db766dcff1e76b 100644 (file)
--- a/utils/lit/lit/ProgressBar.py
+++ b/utils/lit/lit/ProgressBar.py
@@ -16,13 +16,13 @@ class TerminalController:
     output to the terminal:
 
         >>> term = TerminalController()
-        >>> print 'This is '+term.GREEN+'green'+term.NORMAL
+        >>> print('This is '+term.GREEN+'green'+term.NORMAL)
 
     Alternatively, the `render()` method can used, which replaces
     '${action}' with the string required to perform 'action':
 
         >>> term = TerminalController()
-        >>> print term.render('This is ${GREEN}green${NORMAL}')
+        >>> print(term.render('This is ${GREEN}green${NORMAL}'))
 
     If the terminal doesn't support a given action, then the value of
     the corresponding instance variable will be set to ''.  As a
@@ -34,7 +34,7 @@ class TerminalController:
 
         >>> term = TerminalController()
         >>> if term.CLEAR_SCREEN:
-        ...     print 'This terminal supports clearning the screen.'
+        ...     print('This terminal supports clearning the screen.')
 
     Finally, if the width and height of the terminal are known, then
     they will be stored in the `COLS` and `LINES` attributes.

diff --git a/utils/lit/lit/ShCommands.py b/utils/lit/lit/ShCommands.py
index 7e5812165c0b597b32f7420b6c20c6290197af08..431f0074a634d6bffb9148602459aca65218d80e 100644 (file)
--- a/utils/lit/lit/ShCommands.py
+++ b/utils/lit/lit/ShCommands.py
@@ -21,7 +21,7 @@ class Command:
                 quoted = '"%s"' % arg
             else:
                 raise NotImplementedError('Unable to quote %r' % arg)
-            print >>file, quoted,
+            file.write(quoted)
 
             # For debugging / validation.
             import ShUtil
@@ -31,9 +31,9 @@ class Command:
 
         for r in self.redirects:
             if len(r[0]) == 1:
-                print >>file, "%s '%s'" % (r[0][0], r[1]),
+                file.write("%s '%s'" % (r[0][0], r[1]))
             else:
-                print >>file, "%s%s '%s'" % (r[0][1], r[0][0], r[1]),
+                file.write("%s%s '%s'" % (r[0][1], r[0][0], r[1]))
 
 class Pipeline:
     def __init__(self, commands, negate=False, pipe_err=False):
@@ -56,11 +56,11 @@ class Pipeline:
         if pipefail != self.pipe_err:
             raise ValueError('Inconsistent "pipefail" attribute!')
         if self.negate:
-            print >>file, '!',
+            file.write('! ')
         for cmd in self.commands:
             cmd.toShell(file)
             if cmd is not self.commands[-1]:
-                print >>file, '|\n ',
+                file.write('|\n  ')
 
 class Seq:
     def __init__(self, lhs, op, rhs):
@@ -81,5 +81,5 @@ class Seq:
 
     def toShell(self, file, pipefail=False):
         self.lhs.toShell(file, pipefail)
-        print >>file, ' %s\n' % self.op
+        file.write(' %s\n' % self.op)
         self.rhs.toShell(file, pipefail)

diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index 85e32933172e814b6013009004ba3ac2da0ef499..d8bc7e5911f7283660b8c5f1210924b80b7198e4 100644 (file)
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -437,22 +437,21 @@ def parseIntegratedTestScript(test, normalize_slashes=False,
 
 def formatTestOutput(status, out, err, exitCode, script):
     output = StringIO.StringIO()
-    print >>output, "Script:"
-    print >>output, "--"
-    print >>output, '\n'.join(script)
-    print >>output, "--"
-    print >>output, "Exit Code: %r" % exitCode,
-    print >>output
+    output.write("Script:\n")
+    output.write("--\n")
+    output.write('\n'.join(script))
+    output.write("\n--\n")
+    output.write("Exit Code: %r\n\n" % exitCode)
     if out:
-        print >>output, "Command Output (stdout):"
-        print >>output, "--"
+        output.write("Command Output (stdout):\n")
+        output.write("--\n")
         output.write(out)
-        print >>output, "--"
+        output.write("--\n")
     if err:
-        print >>output, "Command Output (stderr):"
-        print >>output, "--"
+        output.write("Command Output (stderr):\n")
+        output.write("--\n")
         output.write(err)
-        print >>output, "--"
+        output.write("--\n")
     return (status, output.getvalue())
 
 def executeShTest(test, litConfig, useExternalSh,

diff --git a/utils/lit/lit/discovery.py b/utils/lit/lit/discovery.py
index 531281e5de0891b580a91614d19b835568b87f1a..86cc46e2d93ed81600b2dfe5d0495db43969eab2 100644 (file)
--- a/utils/lit/lit/discovery.py
+++ b/utils/lit/lit/discovery.py
@@ -215,7 +215,7 @@ def find_tests_for_inputs(lit_config, inputs):
 
     # If there were any errors during test discovery, exit now.
     if lit_config.numErrors:
-        print >>sys.stderr, '%d errors, exiting.' % lit_config.numErrors
+        sys.stderr.write('%d errors, exiting.\n' % lit_config.numErrors)
         sys.exit(2)
 
     return tests

diff --git a/utils/lit/lit/main.py b/utils/lit/lit/main.py
index 167b4098e9fe15d497184d3cb4ef22360b3eda72..31001595b3f24314d2728ba8fbe45f8a1e3a626a 100755 (executable)
--- a/utils/lit/lit/main.py
+++ b/utils/lit/lit/main.py
@@ -407,7 +407,7 @@ def main(builtinParameters = {}):
         print('%s (%d):' % (title, len(elts)))
         for t in elts:
             print('    %s' % t.getFullName())
-        print
+        sys.stdout.write('\n')
 
     if opts.timeTests:
         # Collate, in case we repeated tests.
@@ -435,12 +435,12 @@ def main(builtinParameters = {}):
 
     # If we encountered any additional errors, exit abnormally.
     if litConfig.numErrors:
-        print >>sys.stderr, '\n%d error(s), exiting.' % litConfig.numErrors
+        sys.stderr.write('\n%d error(s), exiting.\n' % litConfig.numErrors)
         sys.exit(2)
 
     # Warn about warnings.
     if litConfig.numWarnings:
-        print >>sys.stderr, '\n%d warning(s) in tests.' % litConfig.numWarnings
+        sys.stderr.write('\n%d warning(s) in tests.\n' % litConfig.numWarnings)
 
     if hasFailures:
         sys.exit(1)