summaryrefslogtreecommitdiff
path: root/test/Parallel
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-04-18 14:03:36 +0000
committerSteven Knight <knight@baldmt.com>2010-04-18 14:03:36 +0000
commit92ea316aefd6946cd553d8e735e6fd54e1750ff2 (patch)
tree15f668e70035c926caa062d91f2fd806b7b65528 /test/Parallel
parent65370312ea45bf85ebb5ddd64ecc97764c0cdad5 (diff)
downloadscons-92ea316aefd6946cd553d8e735e6fd54e1750ff2.tar.gz
Replace remaining os.path.walk() calls with os.walk().
Diffstat (limited to 'test/Parallel')
-rw-r--r--test/Parallel/duplicate-target.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/test/Parallel/duplicate-target.py b/test/Parallel/duplicate-target.py
index a9d511ec..efe20d94 100644
--- a/test/Parallel/duplicate-target.py
+++ b/test/Parallel/duplicate-target.py
@@ -56,16 +56,20 @@ test.write(['work', 'mytar.py'], """\
import sys
import os.path
-def visit(arg, dirname, fnames):
- fnames.sort()
- for fn in fnames:
- p = os.path.join(dirname, fn)
- if os.path.isfile(p):
- arg.write(open(p, 'rb').read())
-
fp = open(sys.argv[1], 'wb')
+
+def visit(dirname):
+ names = os.listdir(dirname)
+ names.sort()
+ for n in names:
+ p = os.path.join(dirname, n)
+ if os.path.isdir(p):
+ visit(p)
+ elif os.path.isfile(p):
+ fp.write(open(p, 'rb').read())
+
for s in sys.argv[2:]:
- os.path.walk(s, visit, fp)
+ visit(s)
""")
test.write(['work', 'SConstruct'], """\