Further python3 compatibility updates.

This has been tested with scons2, but not with scons3.
2to3 runs perform no further useful transformations.

SConstruct

@@ -268,7 +268,7 @@ if sys.platform == 'win32':
 
             sAttrs = win32security.SECURITY_ATTRIBUTES()
             StartupInfo = win32process.STARTUPINFO()
-            newargs = string.join(map(escape, args[1:]), ' ')
+            newargs = ' '.join(map(escape, args[1:]))
             cmdline = cmd + " " + newargs
 
             # check for any special operating system commands
@@ -563,9 +563,9 @@ else                  : build_suffix = "-" + build
 Export("build_suffix")
 env.SConscript("src/SConscript", variant_dir = build_dir, duplicate = False)
 Import(binaries + ["sources"])
-binary_nodes = map(eval, binaries)
-all = env.Alias("all", map(Alias, binaries))
-env.Default(map(Alias, env["default_targets"]))
+binary_nodes = [eval(binary) for binary in binaries]
+all = env.Alias("all", [Alias(binary) for binary in binaries])
+env.Default([Alias(target) for target in env["default_targets"]])
 
 if have_client_prereqs and env["nls"]:
     env.Requires("wesnoth", Dir("translations"))
@@ -616,7 +616,7 @@ def InstallManpages(env, component):
 
 # The game and associated resources
 env.InstallBinary(wesnoth)
-env.InstallData("datadir", "wesnoth", map(Dir, installable_subs))
+env.InstallData("datadir", "wesnoth", [Dir(sub) for sub in installable_subs])
 env.InstallData("docdir",  "wesnoth", [Glob("doc/manual/*.html"), Dir("doc/manual/styles"), Dir("doc/manual/images")])
 if env["nls"]:
     env.InstallData("localedir", "wesnoth", Dir("translations"))

scons/boost.py

@@ -28,7 +28,9 @@ def find_boost(env):
         versions = []
         for prefix, includefile in includes:
             try:
-                versions.append(map(int, re.findall(r"^boost-(\d*)_(\d*)$", basename(dirname(dirname(includefile))))[0]))
+                testname = basename(dirname(dirname(includefile)))
+                major, minor = re.findall(r"^boost-(\d*)_(\d*)$", testname)[0]
+                versions.append((int(major), int(minor)))
             except IndexError:
                 versions.append((0,0))
         version_nums = [100000 * major_minor[0] + 100 * major_minor[1] for major_minor in versions]