diff options
author | Steven Knight <knight@baldmt.com> | 2010-04-20 06:00:36 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2010-04-20 06:00:36 (GMT) |
commit | 8a3e19c85c853ad7ee45b45e4afb63a617946145 (patch) | |
tree | d3f8269d0e8c1d76786aa3a415ba616b18c5d04e /src | |
parent | 7cc7b7c437b79c27354859b1d81f8338a6ce7a2d (diff) | |
download | SCons-8a3e19c85c853ad7ee45b45e4afb63a617946145.zip SCons-8a3e19c85c853ad7ee45b45e4afb63a617946145.tar.gz SCons-8a3e19c85c853ad7ee45b45e4afb63a617946145.tar.bz2 |
Rewrite uses of reduce(), which is being deprecated for Python 3.x.
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/Environment.py | 4 | ||||
-rw-r--r-- | src/engine/SCons/Node/FSTests.py | 5 | ||||
-rw-r--r-- | src/engine/SCons/Node/NodeTests.py | 5 | ||||
-rw-r--r-- | src/engine/SCons/Platform/__init__.py | 5 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index cd637bb..d9db852 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -1507,7 +1507,9 @@ class Base(SubstitutionEnvironment): else: tdlist.append((target.split(), depends.split())) if only_one: - targets = reduce(lambda x, y: x+y, [p[0] for p in tdlist]) + targets = [] + for td in tdlist: + targets.extend(td[0]) if len(targets) > 1: raise SCons.Errors.UserError( "More than one dependency target found in `%s': %s" diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index 339d124..58726d3 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -2093,7 +2093,10 @@ class EntryTestCase(_tempdirTestCase): def __init__(self, val): self.val = val def collect(self, args): - return reduce(lambda x, y: x+y, args) + result = 0 + for a in args: + result += a + return result def signature(self, executor): return self.val + 222 self.module = M(val) diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py index 6de6d38..beb9a31 100644 --- a/src/engine/SCons/Node/NodeTests.py +++ b/src/engine/SCons/Node/NodeTests.py @@ -215,7 +215,10 @@ class Calculator: def signature(self, args): return self.val def collect(self, args): - return reduce(lambda x, y: x+y, args, self.val) + result = self.val + for a in args: + result += a + return result self.module = M(val) diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py index 244d090..e1066f0 100644 --- a/src/engine/SCons/Platform/__init__.py +++ b/src/engine/SCons/Platform/__init__.py @@ -166,7 +166,10 @@ class TempFileMunge: except ValueError: maxline = 2048 - if (reduce(lambda x, y: x + len(y), cmd, 0) + len(cmd)) <= maxline: + length = 0 + for c in cmd: + length += len(c) + if length <= maxline: return self.cmd # We do a normpath because mktemp() has what appears to be |