Skip to content

Commit

Permalink
[lit] Eliminate some nested imports.
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188007 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
ddunbar committed Aug 8, 2013
1 parent 9d11edb commit 0e5f7c5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
7 changes: 2 additions & 5 deletions utils/lit/lit/LitConfig.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from __future__ import absolute_import
import inspect
import os
import sys

import lit.Test
import lit.TestFormats
Expand Down Expand Up @@ -75,8 +77,6 @@ def load_config(self, config, path):

def getBashPath(self):
"""getBashPath - Get the path to 'bash'"""
import os

if self.bashPath is not None:
return self.bashPath

Expand Down Expand Up @@ -110,8 +110,6 @@ def getToolsPath(self, dir, paths, tools):
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.
Expand All @@ -134,6 +132,5 @@ def error(self, message):
self.numErrors += 1

def fatal(self, message):
import sys
self._write_message('fatal', message)
sys.exit(2)
1 change: 0 additions & 1 deletion utils/lit/lit/ProgressBar.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ def clear(self):
self.cleared = 1

def test():
import time
tc = TerminalController()
p = ProgressBar(tc, 'Tests')
for i in range(101):
Expand Down
12 changes: 6 additions & 6 deletions utils/lit/lit/Util.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import os, sys
import errno
import itertools
import math
import os
import subprocess
import sys

def detectCPUs():
"""
Expand All @@ -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

Expand All @@ -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,
Expand Down Expand Up @@ -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])
Expand Down
1 change: 0 additions & 1 deletion utils/lit/lit/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0e5f7c5

Please sign in to comment.