Replace remaining os.path.walk() calls with os.walk().

3 files changed, 3 insertions, 33 deletions

diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py
index 9cc1d96a..c84a2f07 100644
--- a/test/Java/Java-1.4.py
+++ b/test/Java/Java-1.4.py
@@ -334,19 +334,9 @@ expect_6 = [
 
 failed = None
 
-def get_class_files(dir):
-    def find_class_files(arg, dirname, fnames):
-        for fname in fnames:
-            if fname[-6:] == '.class':
-                arg.append(os.path.join(dirname, fname))
-    result = []
-    os.path.walk(dir, find_class_files, result)
-    result.sort()
-    return result
-
 def classes_must_match(dir, expect):
     global failed
-    got = get_class_files(test.workpath(dir))
+    got = test.java_get_class_files(test.workpath(dir))
     if expect != got:
         missing = set(expect) - set(got)
         if missing:
diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py
index ca9cbceb..6c4ea460 100644
--- a/test/Java/Java-1.5.py
+++ b/test/Java/Java-1.5.py
@@ -334,19 +334,9 @@ expect_6 = [
 
 failed = None
 
-def get_class_files(dir):
-    def find_class_files(arg, dirname, fnames):
-        for fname in fnames:
-            if fname[-6:] == '.class':
-                arg.append(os.path.join(dirname, fname))
-    result = []
-    os.path.walk(dir, find_class_files, result)
-    result.sort()
-    return result
-
 def classes_must_match(dir, expect):
     global failed
-    got = get_class_files(test.workpath(dir))
+    got = test.java_get_class_files(test.workpath(dir))
     if expect != got:
         sys.stderr.write("Expected the following class files in '%s':\n" % dir)
         for c in expect:
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py
index ec6df54d..d34fccac 100644
--- a/test/Java/Java-1.6.py
+++ b/test/Java/Java-1.6.py
@@ -334,19 +334,9 @@ expect_6 = [
 
 failed = None
 
-def get_class_files(dir):
-    def find_class_files(arg, dirname, fnames):
-        for fname in fnames:
-            if fname[-6:] == '.class':
-                arg.append(os.path.join(dirname, fname))
-    result = []
-    os.path.walk(dir, find_class_files, result)
-    result.sort()
-    return result
-
 def classes_must_match(dir, expect):
     global failed
-    got = get_class_files(test.workpath(dir))
+    got = test.java_get_class_files(test.workpath(dir))
     if expect != got:
         sys.stderr.write("Expected the following class files in '%s':\n" % dir)
         for c in expect: