http://scons.tigris.org/issues/show_bug.cgi?id=2345

Quiet the rest of the 'callable' warnings and fix the rest of the 'cmp
argument' warnings.

2 files changed, 2 insertions, 3 deletions

diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py
index 53b57ff..300f69f 100644
--- a/test/GetBuildFailures/option-k.py
+++ b/test/GetBuildFailures/option-k.py
@@ -64,8 +64,7 @@ Command('f6', 'f6.in', r'@%(_python_)s mypass.py f5 -  $TARGET $SOURCE')
 
 def print_build_failures():
     from SCons.Script import GetBuildFailures
-    for bf in sorted(GetBuildFailures(),
-                     cmp=lambda a,b: cmp(a.filename, b.filename)):
+    for bf in sorted(GetBuildFailures(), key=lambda a: a.filename):
         print "%%s failed:  %%s" %% (bf.node, bf.errstr)
 
 try:
diff --git a/test/Glob/source.py b/test/Glob/source.py
index afa17f5..f1ea566 100644
--- a/test/Glob/source.py
+++ b/test/Glob/source.py
@@ -66,7 +66,7 @@ env.Concatenate('f.out', sorted(Glob('f[45].in', source=True),
 test.write(['var2', 'SConscript'], """\
 Import("env")
 
-f_in = sorted(Glob('f[67].in'), cmp=lambda a,b: cmp(a.name, b.name))
+f_in = sorted(Glob('f[67].in'), key=lambda a: a.name)
 env.Concatenate('f.out', f_in)
 """)