9 files changed, 10 insertions, 15 deletions
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index ee552f4..34657ff 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index 09639ea..baedac0 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -29,9 +29,8 @@ Test setting the JAVAC variable.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index 95abd33..32ad119 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os.path
+import os
 import string
 
 import TestSCons
diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py
index 3c0e1ed..0906513 100644
--- a/test/Java/Java-1.4.py
+++ b/test/Java/Java-1.4.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.4 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py
index f6d93c7..20ebc25 100644
--- a/test/Java/Java-1.5.py
+++ b/test/Java/Java-1.5.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.5 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py
index 5bd8e2f..649cf01 100644
--- a/test/Java/Java-1.6.py
+++ b/test/Java/Java-1.6.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.6 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index f9721c2..3340707 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -27,6 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -34,7 +35,7 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('myrmic.py', r"""
-import os.path
+import os
 import sys
 args = sys.argv[1:]
 while args:
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index b5f24f9..34e814b 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -29,6 +29,8 @@ Real-world test (courtesy Leanid Nazdrynau) of the multi-step
 capabilities of the various Java Builders.
 """
 
+import os
+
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -562,7 +564,6 @@ test.must_exist(['buildout', 'jni', 'SampleTest.java'])
 # a SampleTest.class file, while others do.  Only issue a warning if
 # it doesn't exist.
 p = test.workpath('buildout', 'jni', 'SampleTest.class')
-import os.path
 if not os.path.exists(p):
     print 'Warning:  %s does not exist' % p
 
diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py
index 3d3e990..3550e76 100644
--- a/test/Java/nested-classes.py
+++ b/test/Java/nested-classes.py
@@ -29,9 +29,7 @@ Test Java compilation with inner and anonymous classes (Issue 2087).
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_