diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-08-17 04:16:04 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-08-17 04:16:04 +0000 |
| commit | 047e4a915d899b31dcb49fd820914df6a9991870 (patch) | |
| tree | e9d90462ffbe4d527fbbdb908eda52b4213578ab /Lib/distutils | |
| parent | 94f243aa41286fa6f3733c21d7936222e7f6c251 (diff) | |
| download | cpython-git-047e4a915d899b31dcb49fd820914df6a9991870.tar.gz | |
Update distutils so that it triggers no warnings when run under -3.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/command/build_py.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/core.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 8cf7888117..1461409f60 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 be6d2c5b4d..3bf1267328 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 de9ce7d7ff..a0e44ea631 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 |