diff options
Diffstat (limited to 'src/engine/SCons/Scanner/RCTests.py')
| -rw-r--r-- | src/engine/SCons/Scanner/RCTests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py index bf1048d..a20c919 100644 --- a/src/engine/SCons/Scanner/RCTests.py +++ b/src/engine/SCons/Scanner/RCTests.py @@ -88,10 +88,10 @@ class DummyEnvironment(UserDict.UserDict): def subst_path(self, path, target=None, source=None, conv=None): if type(path) != type([]): path = [path] - return map(self.subst, path) + return list(map(self.subst, path)) def has_key(self, key): - return self.Dictionary().has_key(key) + return key in self.Dictionary() def get_calculator(self): return None @@ -112,8 +112,8 @@ if os.path.normcase('foo') == os.path.normcase('FOO'): my_normpath = os.path.normcase def deps_match(self, deps, headers): - scanned = map(my_normpath, map(str, deps)) - expect = map(my_normpath, headers) + scanned = list(map(my_normpath, list(map(str, deps)))) + expect = list(map(my_normpath, headers)) scanned.sort() expect.sort() self.failUnless(scanned == expect, "expect %s != scanned %s" % (expect, scanned)) |