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

Accumulated small fixers: renames, next, zip, and intern.

Files that were modified or added while developing on branches/pending didn't
have the fixers previously applied.  This patchset picks up those.

17 files changed, 114 insertions, 134 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index e5b8147..4e455da 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -647,7 +647,7 @@ class Base(SCons.Node.Node):
             return self._memo['_save_str']
         except KeyError:
             pass
-        result = intern(self._get_str())
+        result = sys.intern(self._get_str())
         self._memo['_save_str'] = result
         return result
 
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 6b76e9a..9c5973c 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -1101,22 +1101,22 @@ class NodeTestCase(unittest.TestCase):
 
         nw = SCons.Node.Walker(n1)
         assert not nw.is_done()
-        assert nw.next().name ==  "n1"
+        assert nw.get_next().name ==  "n1"
         assert nw.is_done()
-        assert nw.next() is None
+        assert nw.get_next() is None
 
         n2 = MyNode("n2")
         n3 = MyNode("n3")
         n1.add_source([n2, n3])
 
         nw = SCons.Node.Walker(n1)
-        n = nw.next()
+        n = nw.get_next()
         assert n.name ==  "n2", n.name
-        n = nw.next()
+        n = nw.get_next()
         assert n.name ==  "n3", n.name
-        n = nw.next()
+        n = nw.get_next()
         assert n.name ==  "n1", n.name
-        n = nw.next()
+        n = nw.get_next()
         assert n is None, n
 
         n4 = MyNode("n4")
@@ -1127,17 +1127,17 @@ class NodeTestCase(unittest.TestCase):
         n3.add_dependency([n6, n7])
 
         nw = SCons.Node.Walker(n1)
-        assert nw.next().name ==  "n4"
-        assert nw.next().name ==  "n5"
+        assert nw.get_next().name ==  "n4"
+        assert nw.get_next().name ==  "n5"
         assert n2 in nw.history
-        assert nw.next().name ==  "n2"
-        assert nw.next().name ==  "n6"
-        assert nw.next().name ==  "n7"
+        assert nw.get_next().name ==  "n2"
+        assert nw.get_next().name ==  "n6"
+        assert nw.get_next().name ==  "n7"
         assert n3 in nw.history
-        assert nw.next().name ==  "n3"
+        assert nw.get_next().name ==  "n3"
         assert n1 in nw.history
-        assert nw.next().name ==  "n1"
-        assert nw.next() is None
+        assert nw.get_next().name ==  "n1"
+        assert nw.get_next() is None
 
         n8 = MyNode("n8")
         n8.add_dependency([n3])
@@ -1150,16 +1150,16 @@ class NodeTestCase(unittest.TestCase):
         global cycle_detected
 
         nw = SCons.Node.Walker(n3, cycle_func = cycle)
-        n = nw.next()
+        n = nw.get_next()
         assert n.name == "n6", n.name
-        n = nw.next()
+        n = nw.get_next()
         assert n.name == "n8", n.name
         assert cycle_detected
         cycle_detected = None
-        n = nw.next()
+        n = nw.get_next()
         assert n.name == "n7", n.name
-        n = nw.next()
-        assert nw.next() is None
+        n = nw.get_next()
+        assert nw.get_next() is None
 
     def test_abspath(self):
         """Test the get_abspath() method."""
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 455487e..d7846c5 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -1276,7 +1276,7 @@ class Walker:
 
     This is depth-first, children are visited before the parent.
     The Walker object can be initialized with any node, and
-    returns the next node on the descent with each next() call.
+    returns the next node on the descent with each get_next() call.
     'kids_func' is an optional function that will be called to
     get the children of a node instead of calling 'children'.
     'cycle_func' is an optional function that will be called
@@ -1296,7 +1296,7 @@ class Walker:
         self.history = {} # used to efficiently detect and avoid cycles
         self.history[node] = None
 
-    def next(self):
+    def get_next(self):
         """Return the next node for this walk of the tree.
 
         This function is intentionally iterative, not recursive,
diff --git a/src/engine/SCons/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py
index c546fc9..63316fd 100644
--- a/src/engine/SCons/Script/Interactive.py
+++ b/src/engine/SCons/Script/Interactive.py
@@ -247,9 +247,9 @@ class SConsInteractiveCmd(cmd.Cmd):
             walker = SCons.Node.Walker(node,
                                         kids_func=get_unseen_children,
                                         eval_func=add_to_seen_nodes)
-            n = walker.next()
+            n = walker.get_next()
             while n:
-                n = walker.next()
+                n = walker.get_next()
 
         for node in seen_nodes.keys():
             # Call node.clear() to clear most of the state
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index ae5415d..b8aae84 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -36,9 +36,9 @@ __doc__ = """Module for Visual C/C++ detection and configuration.
 """
 import SCons.compat
 
-import string
 import os
 import platform
+from string import digits as string_digits
 
 import SCons.Warnings
 
@@ -218,7 +218,7 @@ def find_batch_file(env,msvc_version):
     debug('vc.py: find_batch_file() pdir:%s'%pdir)
 
     # filter out e.g. "Exp" from the version name
-    msvc_ver_numeric = string.join(filter(lambda x: x in string.digits + ".", msvc_version), '')
+    msvc_ver_numeric = ''.join([x for x in msvc_version if x in string_digits + "."])
     vernum = float(msvc_ver_numeric)
     if 7 <= vernum < 8:
         pdir = os.path.join(pdir, os.pardir, "Common7", "Tools")
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index f8bac89..8aa5f23 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -1568,22 +1568,14 @@ def MD5collect(signatures):
 
 
 
-# Wrap the intern() function so it doesn't throw exceptions if ineligible
-# arguments are passed. The intern() function was moved into the sys module in
-# Python 3.
-try:
-    intern
-except NameError:
-    from sys import intern
-
 def silent_intern(x):
     """
-    Perform intern() on the passed argument and return the result.
+    Perform sys.intern() on the passed argument and return the result.
     If the input is ineligible (e.g. a unicode string) the original argument is
     returned and no exception is thrown.
     """
     try:
-        return intern(x)
+        return sys.intern(x)
     except TypeError:
         return x
 
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index d959518..49c317c 100644
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -117,7 +117,7 @@ except AttributeError:
         import os,posixpath
         result=[]
         pat = os.path.normcase(pat)
-        if not fnmatch._cache.has_key(pat):
+        if pat not in fnmatch._cache:
             import re
             res = fnmatch.translate(pat)
             fnmatch._cache[pat] = re.compile(res)
@@ -269,15 +269,8 @@ try:
     sys.maxsize
 except AttributeError:
     # Pre-2.6 Python has no sys.maxsize attribute
-    sys.maxsize = sys.maxint
-try:
-    sys.version_info
-except AttributeError:
-    # Pre-1.6 Python has no sys.version_info
-    import string
-    version_string = string.split(sys.version)[0]
-    version_ints = map(int, string.split(version_string, '.'))
-    sys.version_info = tuple(version_ints + ['final', 0])
+    # Wrapping sys in () is silly, but protects it from 2to3 renames fixer
+    sys.maxsize = (sys).maxint
 
 try:
     import UserString
@@ -308,7 +301,7 @@ except AttributeError:
             flags = flags | os.O_BINARY
         while True:
             try :
-                name = apply(tempfile.mktemp, args, kw)
+                name = tempfile.mktemp(*args, **kw)
                 fd = os.open( name, flags, 0600 )
                 return (fd, os.path.abspath(name))
             except OSError, e:
diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py
index dfc2b30..59be10b 100644
--- a/src/engine/SCons/compat/_scons_UserString.py
+++ b/src/engine/SCons/compat/_scons_UserString.py
@@ -36,7 +36,7 @@ in later versions.
 try: unicode
 except NameError:
     def is_String(obj):
-        return type(obj) is str
+        return isinstance(obj, str)
 else:
     def is_String(obj):
         return type(obj) in (str, unicode)
@@ -57,9 +57,9 @@ class UserString:
     def __complex__(self): return complex(self.data)
     def __hash__(self): return hash(self.data)
 
-    def __cmp__(self, string):
+    def __cmp__(self, str):
         if isinstance(string, UserString):
-            return cmp(self.data, string.data)
+            return cmp(self.data, str.data)
         else:
             return cmp(self.data, string)
     def __contains__(self, char):
diff --git a/src/engine/SCons/compat/_scons_hashlib.py b/src/engine/SCons/compat/_scons_hashlib.py
index 7b84cb7..66a3255 100644
--- a/src/engine/SCons/compat/_scons_hashlib.py
+++ b/src/engine/SCons/compat/_scons_hashlib.py
@@ -34,7 +34,7 @@ the underlying md5 module isn't available.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import md5
-import string
+from string import hexdigits
 
 class md5obj:
 
@@ -72,7 +72,7 @@ class md5obj:
         # hexdigest() method (*cough* 1.5.2 *cough*), so provide an
         # equivalent lifted from elsewhere.
         def hexdigest(self):
-            h = string.hexdigits
+            h = hexdigits
             r = ''
             for c in self.digest():
                 i = ord(c)
diff --git a/src/engine/SCons/compat/_scons_itertools.py b/src/engine/SCons/compat/_scons_itertools.py
index 3d6cb86..849679e 100644
--- a/src/engine/SCons/compat/_scons_itertools.py
+++ b/src/engine/SCons/compat/_scons_itertools.py
@@ -90,13 +90,13 @@ def ifilterfalse(predicate, iterable):
     return result
 
 def imap(function, *iterables):
-    return apply(map, (function,) + tuple(iterables))
+    return iter(map(function, *tuple(iterables)))
 
 def islice(*args, **kw):
     raise NotImplementedError
 
 def izip(*iterables):
-    return apply(zip, iterables)
+    return iter(zip(*iterables))
 
 def repeat(*args, **kw):
     # returns infinite length, should not be supported
diff --git a/src/engine/SCons/compat/_scons_optparse.py b/src/engine/SCons/compat/_scons_optparse.py
index ac5b448..b59537d 100644
--- a/src/engine/SCons/compat/_scons_optparse.py
+++ b/src/engine/SCons/compat/_scons_optparse.py
@@ -66,7 +66,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
-import string
 import sys, os
 import types
 import textwrap
@@ -161,7 +160,7 @@ class AmbiguousOptionError (BadOptionError):
 
     def __str__(self):
         return (_("ambiguous option: %s (%s?)")
-                % (self.opt_str, string.join(self.possibilities, ", ")))
+                % (self.opt_str, ", ".join(self.possibilities)))
 
 
 class HelpFormatter:
@@ -296,7 +295,7 @@ class HelpFormatter:
         if default_value is NO_DEFAULT or default_value is None:
             default_value = self.NO_DEFAULT_VALUE
 
-        return string.replace(option.help, self.default_tag, str(default_value))
+        return option.help.replace(self.default_tag, str(default_value))
 
     def format_option(self, option):
         # The help for each option consists of two parts:
@@ -331,7 +330,7 @@ class HelpFormatter:
                 result.append("%*s%s\n" % (self.help_position, "", line))
         elif opts[-1] != "\n":
             result.append("\n")
-        return string.join(result, "")
+        return "".join(result)
 
     def store_option_strings(self, parser):
         self.indent()
@@ -354,7 +353,7 @@ class HelpFormatter:
     def format_option_strings(self, option):
         """Return a comma-separated list of option strings & metavariables."""
         if option.takes_value():
-            metavar = option.metavar or string.upper(option.dest)
+            metavar = option.metavar or option.dest.upper()
             short_opts = []
             for sopt in option._short_opts:
                 short_opts.append(self._short_opt_fmt % (sopt, metavar))
@@ -370,7 +369,7 @@ class HelpFormatter:
         else:
             opts = long_opts + short_opts
 
-        return string.join(opts, ", ")
+        return ", ".join(opts)
 
 class IndentedHelpFormatter (HelpFormatter):
     """Format help with indented section bodies.
@@ -411,9 +410,9 @@ class TitledHelpFormatter (HelpFormatter):
 
 
 def _parse_num(val, type):
-    if string.lower(val[:2]) == "0x":         # hexadecimal
+    if val[:2].lower() == "0x":         # hexadecimal
         radix = 16
-    elif string.lower(val[:2]) == "0b":       # binary
+    elif val[:2].lower() == "0b":       # binary
         radix = 2
         val = val[2:] or "0"            # have to remove "0b" prefix
     elif val[:1] == "0":                # octal
@@ -458,7 +457,7 @@ def check_choice(option, opt, value):
     if value in option.choices:
         return value
     else:
-        choices = string.join(map(repr, option.choices), ", ")
+        choices = ", ".join(map(repr, option.choices))
         raise OptionValueError(
             _("option %s: invalid choice: %r (choose from %s)")
             % (opt, value, choices))
@@ -606,7 +605,7 @@ class Option:
         # Filter out None because early versions of Optik had exactly
         # one short option and one long option, either of which
         # could be None.
-        opts = filter(None, opts)
+        opts = [_f for _f in opts if _f]
         if not opts:
             raise TypeError("at least one option string must be supplied")
         return opts
@@ -634,7 +633,7 @@ class Option:
 
     def _set_attrs(self, attrs):
         for attr in self.ATTRS:
-            if attrs.has_key(attr):
+            if attr in attrs:
                 setattr(self, attr, attrs[attr])
                 del attrs[attr]
             else:
@@ -645,7 +644,7 @@ class Option:
         if attrs:
             attrs = sorted(attrs.keys())
             raise OptionError(
-                "invalid keyword arguments: %s" % string.join(attrs, ", "),
+                "invalid keyword arguments: %s" % ", ".join(attrs),
                 self)
 
 
@@ -673,7 +672,7 @@ class Option:
             # Python 2.1 and earlier, and is short-circuited by the
             # first check on modern Pythons.)
             import __builtin__
-            if ( type(self.type) is types.TypeType or
+            if ( isinstance(self.type, type) or
                  (hasattr(self.type, "__name__") and
                   getattr(__builtin__, self.type.__name__, None) is self.type) ):
                 self.type = self.type.__name__
@@ -695,7 +694,7 @@ class Option:
             elif type(self.choices) not in (tuple, list):
                 raise OptionError(
                     "choices must be a list of strings ('%s' supplied)"
-                    % string.split(str(type(self.choices)), "'")[1], self)
+                    % str(type(self.choices)).split("'")[1], self)
         elif self.choices is not None:
             raise OptionError(
                 "must not supply choices for type %r" % self.type, self)
@@ -711,7 +710,7 @@ class Option:
             # or from the first short option string if no long options.
             if self._long_opts:
                 # eg. "--foo-bar" -> "foo_bar"
-                self.dest = string.replace(self._long_opts[0][2:], '-', '_')
+                self.dest = self._long_opts[0][2:].replace('-', '_')
             else:
                 self.dest = self._short_opts[0][1]
 
@@ -736,12 +735,12 @@ class Option:
                 raise OptionError(
                     "callback not callable: %r" % self.callback, self)
             if (self.callback_args is not None and
-                type(self.callback_args) is not tuple):
+                not isinstance(self.callback_args, tuple)):
                 raise OptionError(
                     "callback_args, if supplied, must be a tuple: not %r"
                     % self.callback_args, self)
             if (self.callback_kwargs is not None and
-                type(self.callback_kwargs) is not dict):
+                not isinstance(self.callback_kwargs, dict)):
                 raise OptionError(
                     "callback_kwargs, if supplied, must be a dict: not %r"
                     % self.callback_kwargs, self)
@@ -770,7 +769,7 @@ class Option:
     # -- Miscellaneous methods -----------------------------------------
 
     def __str__(self):
-        return string.join(self._short_opts + self._long_opts, "/")
+        return "/".join(self._short_opts + self._long_opts)
 
     __repr__ = _repr
 
@@ -798,7 +797,7 @@ class Option:
             if self.nargs == 1:
                 return self.check_value(opt, value)
             else:
-                return tuple(map(lambda v: self.check_value(opt, v), value))
+                return tuple([self.check_value(opt, v) for v in value])
 
     def process(self, opt, value, values, parser):
 
@@ -830,7 +829,7 @@ class Option:
         elif action == "callback":
             args = self.callback_args or ()
             kwargs = self.callback_kwargs or {}
-            apply(self.callback, (self, opt, value, parser,) + args, kwargs)
+            self.callback(self, opt, value, parser, *args, **kwargs)
         elif action == "help":
             parser.print_help()
             parser.exit()
@@ -890,7 +889,7 @@ class Values:
         are silently ignored.
         """
         for attr in dir(self):
-            if dict.has_key(attr):
+            if attr in dict:
                 dval = dict[attr]
                 if dval is not None:
                     setattr(self, attr, dval)
@@ -1010,10 +1009,10 @@ class OptionContainer:
     def _check_conflict(self, option):
         conflict_opts = []
         for opt in option._short_opts:
-            if self._short_opt.has_key(opt):
+            if opt in self._short_opt:
                 conflict_opts.append((opt, self._short_opt[opt]))
         for opt in option._long_opts:
-            if self._long_opt.has_key(opt):
+            if opt in self._long_opt:
                 conflict_opts.append((opt, self._long_opt[opt]))
 
         if conflict_opts:
@@ -1021,7 +1020,7 @@ class OptionContainer:
             if handler == "error":
                 raise OptionConflictError(
                     "conflicting option string(s): %s"
-                    % string.join(map(lambda co: co[0], conflict_opts), ", "),
+                    % ", ".join([co[0] for co in conflict_opts]),
                     option)
             elif handler == "resolve":
                 for (opt, c_option) in conflict_opts:
@@ -1038,8 +1037,8 @@ class OptionContainer:
         """add_option(Option)
            add_option(opt_str, ..., kwarg=val, ...)
         """
-        if type(args[0]) is str:
-            option = apply(self.option_class, args, kwargs)
+        if isinstance(args[0], str):
+            option = self.option_class(*args, **kwargs)
         elif len(args) == 1 and not kwargs:
             option = args[0]
             if not isinstance(option, Option):
@@ -1059,7 +1058,7 @@ class OptionContainer:
         if option.dest is not None:     # option has a dest, we need a default
             if option.default is not NO_DEFAULT:
                 self.defaults[option.dest] = option.default
-            elif not self.defaults.has_key(option.dest):
+            elif option.dest not in self.defaults:
                 self.defaults[option.dest] = None
 
         return option
@@ -1075,8 +1074,8 @@ class OptionContainer:
                 self._long_opt.get(opt_str))
 
     def has_option(self, opt_str):
-        return (self._short_opt.has_key(opt_str) or
-                self._long_opt.has_key(opt_str))
+        return (opt_str in self._short_opt or
+                opt_str in self._long_opt)
 
     def remove_option(self, opt_str):
         option = self._short_opt.get(opt_str)
@@ -1101,7 +1100,7 @@ class OptionContainer:
         for option in self.option_list:
             if not option.help is SUPPRESS_HELP:
                 result.append(formatter.format_option(option))
-        return string.join(result, "")
+        return "".join(result)
 
     def format_description(self, formatter):
         return formatter.format_description(self.get_description())
@@ -1112,7 +1111,7 @@ class OptionContainer:
             result.append(self.format_description(formatter))
         if self.option_list:
             result.append(self.format_option_help(formatter))
-        return string.join(result, "\n")
+        return "\n".join(result)
 
 
 class OptionGroup (OptionContainer):
@@ -1304,7 +1303,7 @@ class OptionParser (OptionContainer):
         elif usage is SUPPRESS_USAGE:
             self.usage = None
         # For backwards compatibility with Optik 1.3 and earlier.
-        elif string.lower(usage)[:7] == "usage: ":
+        elif usage.lower()[:7] == "usage: ":
             self.usage = usage[7:]
         else:
             self.usage = usage
@@ -1349,8 +1348,8 @@ class OptionParser (OptionContainer):
 
     def add_option_group(self, *args, **kwargs):
         # XXX lots of overlap with OptionContainer.add_option()
-        if type(args[0]) is str:
-            group = apply(OptionGroup, (self,) + args, kwargs)
+        if isinstance(args[0], str):
+            group = OptionGroup(self, *args, **kwargs)
         elif len(args) == 1 and not kwargs:
             group = args[0]
             if not isinstance(group, OptionGroup):
@@ -1497,7 +1496,7 @@ class OptionParser (OptionContainer):
         # Value explicitly attached to arg?  Pretend it's the next
         # argument.
         if "=" in arg:
-            (opt, next_arg) = string.split(arg, "=", 1)
+            (opt, next_arg) = arg.split("=", 1)
             rargs.insert(0, next_arg)
             had_explicit_value = True
         else:
@@ -1577,7 +1576,7 @@ class OptionParser (OptionContainer):
             return self.prog
 
     def expand_prog_name(self, s):
-        return string.replace(s, "%prog", self.get_prog_name())
+        return s.replace("%prog", self.get_prog_name())
 
     def get_description(self):
         return self.expand_prog_name(self.description)
@@ -1648,7 +1647,7 @@ class OptionParser (OptionContainer):
             result.append("\n")
         formatter.dedent()
         # Drop the last "\n", or the header if no options or option groups:
-        return string.join(result[:-1], "")
+        return "".join(result[:-1])
 
     def format_epilog(self, formatter):
         return formatter.format_epilog(self.epilog)
@@ -1663,7 +1662,7 @@ class OptionParser (OptionContainer):
             result.append(self.format_description(formatter) + "\n")
         result.append(self.format_option_help(formatter))
         result.append(self.format_epilog(formatter))
-        return string.join(result, "")
+        return "".join(result)
 
     # used by test suite
     def _get_encoding(self, file):
@@ -1694,11 +1693,11 @@ def _match_abbrev(s, wordmap):
     'words', raise BadOptionError.
     """
     # Is there an exact match?
-    if wordmap.has_key(s):
+    if s in wordmap:
         return s
     else:
         # Isolate all words with s as a prefix.
-        possibilities = filter(lambda w: w[:len(s)] == s, wordmap.keys())
+        possibilities = [w for w in wordmap.keys() if w[:len(s)] == s]
         # No exact match, so there had better be just one possibility.
         if len(possibilities) == 1:
             return possibilities[0]
diff --git a/src/engine/SCons/compat/_scons_platform.py b/src/engine/SCons/compat/_scons_platform.py
index 547ee3b..837d4f9 100644
--- a/src/engine/SCons/compat/_scons_platform.py
+++ b/src/engine/SCons/compat/_scons_platform.py
@@ -61,7 +61,7 @@ def uname():
     except AttributeError:
         no_os_uname = 1
 
-    if no_os_uname or not filter(None, (system, node, release, version, machine)):
+    if no_os_uname or not [_f for _f in (system, node, release, version, machine) if _f]:
         # Hmm, no there is either no uname or uname has returned
         #'unknowns'... we'll have to poke around the system then.
         if no_os_uname:
@@ -119,7 +119,7 @@ def uname():
         elif system[:4] == 'java':
             release,vendor,vminfo,osinfo = java_ver()
             system = 'Java'
-            version = string.join(vminfo,', ')
+            version = ', '.join(vminfo)
             if not version:
                 version = vendor
 
diff --git a/src/engine/SCons/compat/_scons_sets15.py b/src/engine/SCons/compat/_scons_sets15.py
index bafa009..b693f78 100644
--- a/src/engine/SCons/compat/_scons_sets15.py
+++ b/src/engine/SCons/compat/_scons_sets15.py
@@ -14,8 +14,6 @@
 # Python 1.5 and 2.1, which don't support __iter__() and iterator types.
 #
 
-import string
-
 class Set:
     """The set class. It can contain mutable objects."""
 
@@ -30,7 +28,7 @@ class Set:
                     self.elems.append(elem)
 
     def __str__(self):
-        return "set([%s])" % string.join(map(str, self.elems), ", ")
+        return "set([%s])" % ", ".join(map(str, self.elems))
 
 
     def copy(self):
@@ -123,7 +121,7 @@ class Set:
         """Cartesian product of two sets."""
         ret = Set()
         for elemself in self.elems:
-            x = map(lambda other, s=elemself: (s, other), other.elems)
+            x = list(map(lambda other, s=elemself: (s, other), other.elems))
             ret.elems.extend(x)
         return ret
 
diff --git a/src/engine/SCons/compat/_scons_shlex.py b/src/engine/SCons/compat/_scons_shlex.py
index 9e30a01..febaa99 100644
--- a/src/engine/SCons/compat/_scons_shlex.py
+++ b/src/engine/SCons/compat/_scons_shlex.py
@@ -26,7 +26,7 @@ try:
 except NameError:
     import types
     def is_basestring(s):
-        return type(s) is types.StringType
+        return isinstance(s, str)
 else:
     def is_basestring(s):
         return isinstance(s, basestring)
@@ -285,7 +285,7 @@ class shlex:
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         token = self.get_token()
         if token == self.eof:
             raise StopIteration
@@ -311,7 +311,7 @@ if __name__ == '__main__':
     else:
         file = sys.argv[1]
         lexer = shlex(open(file), file)
-    while 1:
+    while True:
         tt = lexer.get_token()
         if tt:
             print "Token: " + repr(tt)
diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py
index 417dd60..67eafca 100644
--- a/src/engine/SCons/compat/_scons_subprocess.py
+++ b/src/engine/SCons/compat/_scons_subprocess.py
@@ -356,7 +356,6 @@ import sys
 mswindows = (sys.platform == "win32")
 
 import os
-import string
 import types
 import traceback
 
@@ -445,7 +444,7 @@ try:
     isinstance(1, int)
 except TypeError:
     def is_int(obj):
-        return type(obj) == type(1)
+        return isinstance(obj, type(1))
     def is_int_or_long(obj):
         return type(obj) in (type(1), type(1L))
 else:
@@ -458,9 +457,9 @@ try:
     types.StringTypes
 except AttributeError:
     try:
-        types.StringTypes = (types.StringType, types.UnicodeType)
+        types.StringTypes = (str, unicode)
     except AttributeError:
-        types.StringTypes = (types.StringType,)
+        types.StringTypes = (str,)
     def is_string(obj):
         return type(obj) in types.StringTypes
 else:
@@ -471,7 +470,7 @@ _active = []
 
 def _cleanup():
     for inst in _active[:]:
-        if inst.poll(_deadstate=sys.maxint) >= 0:
+        if inst.poll(_deadstate=sys.maxsize) >= 0:
             try:
                 _active.remove(inst)
             except ValueError:
@@ -504,7 +503,7 @@ def check_call(*popenargs, **kwargs):
 
     check_call(["ls", "-l"])
     """
-    retcode = apply(call, popenargs, kwargs)
+    retcode = call(*popenargs, **kwargs)
     cmd = kwargs.get("args")
     if cmd is None:
         cmd = popenargs[0]
@@ -578,7 +577,7 @@ def list2cmdline(seq):
             result.extend(bs_buf)
             result.append('"')
 
-    return string.join(result, '')
+    return ''.join(result)
 
 
 try:
@@ -674,7 +673,7 @@ class Popen(object):
             # We didn't get to successfully create a child process.
             return
         # In case the child hasn't been waited on, check if it's done.
-        self.poll(_deadstate=sys.maxint)
+        self.poll(_deadstate=sys.maxsize)
         if self.returncode is None and _active is not None:
             # Child is still running, keep us alive until we can wait on it.
             _active.append(self)
@@ -853,7 +852,7 @@ class Popen(object):
                 # a subclass of OSError.  FIXME: We should really
                 # translate errno using _sys_errlist (or simliar), but
                 # how can this be done from Python?
-                raise apply(WindowsError, e.args)
+                raise WindowsError(*e.args)
 
             # Retain the process handle, but close the thread handle
             self._child_created = True
@@ -1100,7 +1099,7 @@ class Popen(object):
                     exc_lines = traceback.format_exception(exc_type,
                                                            exc_value,
                                                            tb)
-                    exc_value.child_traceback = string.join(exc_lines, '')
+                    exc_value.child_traceback = ''.join(exc_lines)
                     os.write(errpipe_write, pickle.dumps(exc_value))
 
                 # This exitcode won't be reported to applications, so it
@@ -1209,9 +1208,9 @@ class Popen(object):
 
             # All data exchanged.  Translate lists into strings.
             if stdout is not None:
-                stdout = string.join(stdout, '')
+                stdout = ''.join(stdout)
             if stderr is not None:
-                stderr = string.join(stderr, '')
+                stderr = ''.join(stderr)
 
             # Translate newlines, if requested.  We cannot let the file
             # object do the translation: It is based on stdio, which is
diff --git a/src/engine/SCons/compat/_scons_textwrap.py b/src/engine/SCons/compat/_scons_textwrap.py
index 81781af..17ea896 100644
--- a/src/engine/SCons/compat/_scons_textwrap.py
+++ b/src/engine/SCons/compat/_scons_textwrap.py
@@ -7,7 +7,8 @@
 
 __revision__ = "$Id: textwrap.py,v 1.32.8.2 2004/05/13 01:48:15 gward Exp $"
 
-import string, re
+import re
+from string import lowercase, maketrans
 
 try:
    unicode
@@ -71,7 +72,7 @@ class TextWrapper:
         be broken, and some lines might be longer than 'width'.
     """
 
-    whitespace_trans = string.maketrans(_whitespace, ' ' * len(_whitespace))
+    whitespace_trans = maketrans(_whitespace, ' ' * len(_whitespace))
 
     unicode_whitespace_trans = {}
     try:
@@ -101,12 +102,10 @@ class TextWrapper:
         wordsep_re = re.compile(r'(\s+|'                    # any whitespace
                                 r'-*\w{2,}-(?=\w{2,}))')    # hyphenated words
 
-    # XXX will there be a locale-or-charset-aware version of
-    # string.lowercase in 2.3?
     sentence_end_re = re.compile(r'[%s]'              # lowercase letter
                                  r'[\.\!\?]'          # sentence-ending punct.
                                  r'[\"\']?'           # optional end-of-quote
-                                 % string.lowercase)
+                                 % lowercase)
 
 
     def __init__(self,
@@ -137,12 +136,12 @@ class TextWrapper:
         becomes " foo    bar  baz".
         """
         if self.expand_tabs:
-            text = string.expandtabs(text)
+            text = text.expandtabs()
         if self.replace_whitespace:
-            if type(text) == type(''):
-                text = string.translate(text, self.whitespace_trans)
+            if isinstance(text, str):
+                text = text.translate(self.whitespace_trans)
             elif isinstance(text, unicode):
-                text = string.translate(text, self.unicode_whitespace_trans)
+                text = text.translate(self.unicode_whitespace_trans)
         return text
 
 
@@ -158,7 +157,7 @@ class TextWrapper:
           'use', ' ', 'the', ' ', '-b', ' ', 'option!'
         """
         chunks = self.wordsep_re.split(text)
-        chunks = filter(None, chunks)
+        chunks = [_f for _f in chunks if _f]
         return chunks
 
     def _fix_sentence_endings(self, chunks):
@@ -242,7 +241,7 @@ class TextWrapper:
 
             # First chunk on line is whitespace -- drop it, unless this
             # is the very beginning of the text (ie. no lines started yet).
-            if string.strip(chunks[0]) == '' and lines:
+            if chunks[0].strip() == '' and lines:
                 del chunks[0]
 
             while chunks:
@@ -263,13 +262,13 @@ class TextWrapper:
                 self._handle_long_word(chunks, cur_line, cur_len, width)
 
             # If the last chunk on this line is all whitespace, drop it.
-            if cur_line and string.strip(cur_line[-1]) == '':
+            if cur_line and cur_line[-1].strip() == '':
                 del cur_line[-1]
 
             # Convert current line back to a string and store it in list
             # of all lines (return value).
             if cur_line:
-                lines.append(indent + string.join(cur_line, ''))
+                lines.append(indent + ''.join(cur_line))
 
         return lines
 
@@ -299,7 +298,7 @@ class TextWrapper:
         more than 'self.width' columns, and return a new string
         containing the entire wrapped paragraph.
         """
-        return string.join(self.wrap(text), "\n")
+        return "\n".join(self.wrap(text))
 
 
 # -- Convenience interface ---------------------------------------------
@@ -316,7 +315,7 @@ def wrap(text, width=70, **kwargs):
     """
     kw = kwargs.copy()
     kw['width'] = width
-    w = apply(TextWrapper, (), kw)
+    w = TextWrapper(**kw)
     return w.wrap(text)
 
 def fill(text, width=70, **kwargs):
@@ -330,7 +329,7 @@ def fill(text, width=70, **kwargs):
     """
     kw = kwargs.copy()
     kw['width'] = width
-    w = apply(TextWrapper, (), kw)
+    w = TextWrapper(**kw)
     return w.fill(text)
 
 
@@ -373,7 +372,7 @@ def dedent(text):
         for i in range(len(lines)):
             lines[i] = lines[i][margin:]
 
-    return string.join(lines, '\n')
+    return '\n'.join(lines)
 
 # Local Variables:
 # tab-width:4
diff --git a/src/engine/SCons/compat/builtins.py b/src/engine/SCons/compat/builtins.py
index 02b94f3..678ef2e 100644
--- a/src/engine/SCons/compat/builtins.py
+++ b/src/engine/SCons/compat/builtins.py
@@ -184,8 +184,8 @@ except NameError:
         argument sequence.
         """
         result = []
-        for i in xrange(min(map(len, lists))):
-            result.append(tuple(map(lambda l: l[i], lists)))
+        for i in xrange(min(list(map(len, lists)))):
+            result.append(tuple([l[i] for l in lists]))
         return result
     __builtin__.zip = zip