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.

2 files changed, 3 insertions, 3 deletions

diff --git a/test/NodeOps.py b/test/NodeOps.py
index e4a403f..6de7d09 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -70,7 +70,7 @@ if %(_E)s:
   real1 = [os.path.exists(str(N)) for N in Nodes]
   exists = [N.exists() for N in Nodes]
   real2 = [os.path.exists(str(N)) for N in Nodes]
-  for N,D,R,E,F in map(None, Nodes, derived, real1, exists, real2):
+  for N,D,R,E,F in zip(Nodes, derived, real1, exists, real2):
     print '%%s: %%s %%s %%s %%s'%%(N,D,R,E,F)
 foo.SharedLibrary(target = 'foo', source = 'foo%(_obj)s')
 bar.SharedLibrary(target = 'bar', source = 'bar%(_obj)s')
diff --git a/test/exitfns.py b/test/exitfns.py
index 3fc1322..f64969b 100644
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -34,9 +34,9 @@ from SCons.exitfuncs import *
 def x1():
     print "running x1"
 def x2(n):
-    print "running x2(%s)" % `n`
+    print "running x2(%s)" % repr(n)
 def x3(n, kwd=None):
-    print "running x3(%s, kwd=%s)" % (`n`, `kwd`)
+    print "running x3(%s, kwd=%s)" % (repr(n), repr(kwd))
 
 register(x3, "no kwd args")
 register(x1)