Remove left-over dir argument from get_contents() calls. (Anthony Roach)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@269 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index b999b52a517d965cb4fe195549397f7ed5d01f18..54f06e6857b4fbdf1264ab40ce6ae633919a10a9 100644 (file)
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -44,7 +44,7 @@ class Builder:
         built_target = kw['target']
         built_source = kw['source']
         return 0
-    def get_contents(self, env, dir):
+    def get_contents(self, env):
         return 7
 
 class NoneBuilder(Builder):

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index c0de58e1bda07f996216ee0735f696f0a0c8635e..918543dd6aee1c1cebcd21ba43a6b6a75c8fe0a1 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -140,7 +140,7 @@ class Node:
                     dir = self.node.getcwd()
                 except AttributeError:
                     dir = None
-                return self.node.builder.get_contents(env = env, dir = dir)
+                return self.node.builder.get_contents(env = env)
         return Adapter(self)
 
     def scanner_set(self, scanner):