diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-15 19:21:08 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-15 19:21:08 (GMT) |
| commit | c06950cad4c02ba6b759c1cbd65cfb52ab6868c3 (patch) | |
| tree | a3e265178b5b9c6d717d657133c3085747287751 /src/engine/SCons/Node/FS.py | |
| parent | d58dff5877e75c3c7813045a075e50b23ecb1dfd (diff) | |
| download | SCons-c06950cad4c02ba6b759c1cbd65cfb52ab6868c3.zip SCons-c06950cad4c02ba6b759c1cbd65cfb52ab6868c3.tar.gz SCons-c06950cad4c02ba6b759c1cbd65cfb52ab6868c3.tar.bz2 | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Fixes due to running the regression tests with the '-3' option to Python2.6,
which causes the run-time to look for potential compatibility problems with
Python 3.x. In some cases, all we can do is quiet the warning since we still
support Python versions that can't use the newer idiom. In other cases, we
fix the problem. This patch contains a mix of quieting and fixing, plus a
little lint.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 6dd5b0b..c8b900f 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1960,8 +1960,7 @@ class Dir(Base): if strings: r = [os.path.join(str(dir), x) for x in r] result.extend(r) - result.sort(lambda a, b: cmp(str(a), str(b))) - return result + return sorted(result, key=lambda a: str(a)) def _glob1(self, pattern, ondisk=True, source=False, strings=False): """ |