summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Variables/__init__.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-04-15 19:21:08 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-04-15 19:21:08 (GMT)
commitc06950cad4c02ba6b759c1cbd65cfb52ab6868c3 (patch)
treea3e265178b5b9c6d717d657133c3085747287751 /src/engine/SCons/Variables/__init__.py
parentd58dff5877e75c3c7813045a075e50b23ecb1dfd (diff)
downloadSCons-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/Variables/__init__.py')
-rw-r--r--src/engine/SCons/Variables/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index 171c098..750d4b3 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -284,7 +284,7 @@ class Variables:
"""
if sort:
- options = sorted(self.options, cmp=lambda x,y: sort(x.key,y.key))
+ options = sorted(self.options, key=lambda x: x.key)
else:
options = self.options