diff options
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/D.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/Prog.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/ScannerTests.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/__init__.py | 8 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/engine/SCons/Scanner/D.py b/src/engine/SCons/Scanner/D.py index b80912d..cd93a69 100644 --- a/src/engine/SCons/Scanner/D.py +++ b/src/engine/SCons/Scanner/D.py @@ -51,7 +51,5 @@ class D(SCons.Scanner.Classic): # translate dots (package separators) to slashes inc = string.replace(include, '.', '/') - i = SCons.Node.FS.find_file(inc + '.d', - (source_dir,) + path, - self.fs.File) + i = SCons.Node.FS.find_file(inc + '.d', (source_dir,) + path) return i, include diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py index f2f3bbf..206c6de 100644 --- a/src/engine/SCons/Scanner/Prog.py +++ b/src/engine/SCons/Scanner/Prog.py @@ -89,7 +89,7 @@ def scan(node, env, libpath = (), fs = SCons.Node.FS.default_fs): lib = env.subst(lib) for pref, suf in pairs: l = adjustixes(lib, pref, suf) - l = find_file(l, libpath, fs.File, verbose=print_find_libs) + l = find_file(l, libpath, verbose=print_find_libs) if l: result.append(l) else: diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py index ce5411c..ef836bc 100644 --- a/src/engine/SCons/Scanner/ScannerTests.py +++ b/src/engine/SCons/Scanner/ScannerTests.py @@ -390,7 +390,7 @@ class ClassicTestCase(unittest.TestCase): env = DummyEnvironment() s = SCons.Scanner.Classic("t", ['.suf'], 'MYPATH', '^my_inc (\S+)') - def _find_file(filename, paths, factory): + def _find_file(filename, paths): return paths[0]+'/'+filename save = SCons.Node.FS.find_file @@ -491,7 +491,7 @@ class ClassicCPPTestCase(unittest.TestCase): env = DummyEnvironment() s = SCons.Scanner.ClassicCPP("Test", [], None, "") - def _find_file(filename, paths, factory): + def _find_file(filename, paths): if callable(paths): paths = paths() return paths[0]+'/'+filename diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index cda156c..247eafb 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -338,9 +338,7 @@ class Classic(Current): def find_include(self, include, source_dir, path): "__cacheable__" if callable(path): path = path() - n = SCons.Node.FS.find_file(include, - (source_dir,) + tuple(path), - SCons.Node.FS.File) + n = SCons.Node.FS.find_file(include, (source_dir,) + tuple(path)) return n, include def sort_key(self, include): @@ -398,9 +396,7 @@ class ClassicCPP(Classic): else: paths = Binder( tuple(path) + (source_dir,) ) - n = SCons.Node.FS.find_file(include[1], - paths, - self.fs.File) + n = SCons.Node.FS.find_file(include[1], paths) return n, include[1] |