[lit] Eliminate some nested imports.

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

diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py
index fda1b7bf98e9fd6a1b4adea293565a1e5c4ec1cf..c183613133227daee5eff9066c9c3a58be87a42b 100644 (file)
--- a/utils/lit/lit/LitConfig.py
+++ b/utils/lit/lit/LitConfig.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import
+import inspect
 import os
+import sys
 
 import lit.Test
 import lit.TestFormats
@@ -75,8 +77,6 @@ class LitConfig:
 
     def getBashPath(self):
         """getBashPath - Get the path to 'bash'"""
-        import os
-
         if self.bashPath is not None:
             return self.bashPath
 
@@ -110,8 +110,6 @@ class LitConfig:
         return dir
 
     def _write_message(self, kind, message):
-        import inspect, os, sys
-
         # Get the file/line where this message was generated.
         f = inspect.currentframe()
         # Step out of _write_message, and then out of wrapper.
@@ -134,6 +132,5 @@ class LitConfig:
         self.numErrors += 1
 
     def fatal(self, message):
-        import sys
         self._write_message('fatal', message)
         sys.exit(2)

diff --git a/utils/lit/lit/ProgressBar.py b/utils/lit/lit/ProgressBar.py
index 2481bdfefa961a622fc783ebd46478337ff0d2f3..8b9b81e1ca12ba43b8741922cb2183c40d63f8b5 100644 (file)
--- a/utils/lit/lit/ProgressBar.py
+++ b/utils/lit/lit/ProgressBar.py
@@ -273,7 +273,6 @@ class ProgressBar:
             self.cleared = 1
 
 def test():
-    import time
     tc = TerminalController()
     p = ProgressBar(tc, 'Tests')
     for i in range(101):

diff --git a/utils/lit/lit/Util.py b/utils/lit/lit/Util.py
index 3b28db48b53f933decd4283cc69974fe960903bb..d7d6d7f16320739a052794d112344d36b5a0c709 100644 (file)
--- a/utils/lit/lit/Util.py
+++ b/utils/lit/lit/Util.py
@@ -1,4 +1,9 @@
-import os, sys
+import errno
+import itertools
+import math
+import os
+import subprocess
+import sys
 
 def detectCPUs():
     """
@@ -23,8 +28,6 @@ def detectCPUs():
 def mkdir_p(path):
     """mkdir_p(path) - Make the "path" directory, if it does not exist; this
     will also make directories for any missing parent directories."""
-    import errno
-
     if not path or os.path.exists(path):
         return
 
@@ -41,7 +44,6 @@ def mkdir_p(path):
             raise
 
 def capture(args, env=None):
-    import subprocess
     """capture(command) - Run the given command (or argv list) in a shell and
     return the standard output."""
     p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
@@ -93,8 +95,6 @@ def whichTools(tools, paths):
     return None
 
 def printHistogram(items, title = 'Items'):
-    import itertools, math
-
     items.sort(key = lambda item: item[1])
 
     maxValue = max([v for _,v in items])

diff --git a/utils/lit/lit/main.py b/utils/lit/lit/main.py
index 41c2a2fb3d9a940ab99bb13e41288bbafc92f5da..9fff75754d5fb370107da7672bf6391258bc054a 100755 (executable)
--- a/utils/lit/lit/main.py
+++ b/utils/lit/lit/main.py
@@ -161,7 +161,6 @@ def main(builtinParameters = {}):
     # blocking operation (hopefully exec) than to try and unblock other threads.
     #
     # FIXME: This is a hack.
-    import sys
     sys.setcheckinterval(1000)
 
     global options