Fix typo that worked on python 2.6.

Also, fix unit tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81194 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/lit/ShCommands.py b/utils/lit/ShCommands.py
index be3e680..4550437 100644
--- a/utils/lit/ShCommands.py
+++ b/utils/lit/ShCommands.py
@@ -1,5 +1,3 @@
-import ShUtil
-
 class Command:
     def __init__(self, args, redirects):
         self.args = list(args)
@@ -26,6 +24,7 @@
             print >>file, quoted,
 
             # For debugging / validation.
+            import ShUtil
             dequoted = list(ShUtil.ShLexer(quoted).lex())
             if dequoted != [arg]:
                 raise NotImplementedError,'Unable to quote %r' % arg