diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-29 11:41:03 +0000 |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-29 11:41:03 +0000 |
commit | edacea30e457e151611a9fe560120cedb3bdc527 (patch) | |
tree | 3227e5e1c060cce48b00d34b9ae46571f079e2fb /Lib/distutils/command/build_scripts.py | |
parent | 82b83985832a0b1922aa86261f764b12a7237ac5 (diff) | |
download | cpython-edacea30e457e151611a9fe560120cedb3bdc527.tar.gz cpython-edacea30e457e151611a9fe560120cedb3bdc527.zip |
Merged revisions 77704,77752 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77704 | tarek.ziade | 2010-01-23 10:23:15 +0100 (Sat, 23 Jan 2010) | 1 line
taking sysconfig out of distutils
........
r77752 | tarek.ziade | 2010-01-26 00:19:56 +0100 (Tue, 26 Jan 2010) | 1 line
switched the call order so this call works without suffering from issue #7774
........
Diffstat (limited to 'Lib/distutils/command/build_scripts.py')
-rw-r--r-- | Lib/distutils/command/build_scripts.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py index 8b08bfeaf02..a54d6ed7429 100644 --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py @@ -6,7 +6,6 @@ __revision__ = "$Id$" import os, re from stat import ST_MODE -from distutils import sysconfig from distutils.core import Command from distutils.dep_util import newer from distutils.util import convert_path, Mixin2to3 @@ -57,6 +56,7 @@ class build_scripts(Command): ie. starts with "\#!" and contains "python"), then adjust the first line to refer to the current Python interpreter as we copy. """ + _sysconfig = __import__('sysconfig') self.mkpath(self.build_dir) outfiles = [] updated_files = [] @@ -96,16 +96,16 @@ class build_scripts(Command): updated_files.append(outfile) if not self.dry_run: outf = open(outfile, "w") - if not sysconfig.python_build: + if not _sysconfig.is_python_build(): outf.write("#!%s%s\n" % (self.executable, post_interp)) else: outf.write("#!%s%s\n" % (os.path.join( - sysconfig.get_config_var("BINDIR"), - "python%s%s" % (sysconfig.get_config_var("VERSION"), - sysconfig.get_config_var("EXE"))), + _sysconfig.get_config_var("BINDIR"), + "python%s%s" % (_sysconfig.get_config_var("VERSION"), + _sysconfig.get_config_var("EXE"))), post_interp)) outf.writelines(f.readlines()) outf.close() |