From 047e4a915d899b31dcb49fd820914df6a9991870 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 17 Aug 2008 04:16:04 +0000
Subject: [PATCH] Update distutils so that it triggers no warnings when run
 under -3.

---
 Lib/distutils/command/build_ext.py |  2 +-
 Lib/distutils/command/build_py.py  |  4 ++--
 Lib/distutils/core.py              |  3 ++-
 Misc/NEWS                          | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 8cf7888117c..1461409f605 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -679,7 +679,7 @@ class build_ext (Command):
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
             return apply(os.path.join, ext_path) + '_d' + so_ext
-        return apply(os.path.join, ext_path) + so_ext
+        return os.path.join(*ext_path) + so_ext
 
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index be6d2c5b4da..3bf12673283 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -169,7 +169,7 @@ class build_py (Command):
                     del path[-1]
                 else:
                     tail.insert(0, pdir)
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
             else:
                 # Oops, got all the way through 'path' without finding a
                 # match in package_dir.  If package_dir defines a directory
@@ -337,7 +337,7 @@ class build_py (Command):
 
     def get_module_outfile (self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
-        return apply(os.path.join, outfile_path)
+        return os.path.join(*outfile_path)
 
 
     def get_outputs (self, include_bytecode=1):
diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index de9ce7d7ff3..a0e44ea6316 100644
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -218,7 +218,8 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            execfile(script_name, g, l)
+            with open(script_name, 'r') as file:
+                exec file.read() in g, l
         finally:
             sys.argv = save_argv
             _setup_stop_after = None
diff --git a/Misc/NEWS b/Misc/NEWS
index 08ee9f9d252..3f5996952b4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,11 +92,11 @@ Library
 
 - Changed code in the following modules/packages to remove warnings raised
   while running under the ``-3`` flag: aifc, asynchat, asyncore, bdb, bsddb,
-  ConfigParser, cookielib, csv, difflib, DocXMLRPCServer, email, filecmp,
-  fileinput, inspect, logging, modulefinder, pdb, pickle, profile, pstats,
-  pydoc, re, rlcompleter, SimpleXMLRPCServer, shelve, socket, subprocess,
-  sqlite3, tarfile, Tkinter, test.test_support, textwrap, threading, tokenize,
-  traceback, urlparse, wsgiref, xml, xmlrpclib.
+  ConfigParser, cookielib, csv, difflib, distutils, DocXMLRPCServer, email,
+  filecmp, fileinput, inspect, logging, modulefinder, pdb, pickle, profile,
+  pstats, pydoc, re, rlcompleter, SimpleXMLRPCServer, shelve, socket,
+  subprocess, sqlite3, tarfile, Tkinter, test.test_support, textwrap,
+  threading, tokenize, traceback, urlparse, wsgiref, xml, xmlrpclib.
 
 - Issue #3039: Fix tarfile.TarFileCompat.writestr() which always
   raised an AttributeError.