diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-29 11:41:03 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-01-29 11:41:03 (GMT) |
| commit | edacea30e457e151611a9fe560120cedb3bdc527 (patch) | |
| tree | 3227e5e1c060cce48b00d34b9ae46571f079e2fb /Lib/distutils/command/bdist_wininst.py | |
| parent | 82b83985832a0b1922aa86261f764b12a7237ac5 (diff) | |
| download | cpython-edacea30e457e151611a9fe560120cedb3bdc527.zip cpython-edacea30e457e151611a9fe560120cedb3bdc527.tar.gz cpython-edacea30e457e151611a9fe560120cedb3bdc527.tar.bz2 | |
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/bdist_wininst.py')
| -rw-r--r-- | Lib/distutils/command/bdist_wininst.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 0b7044a..2cf2823 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -8,11 +8,11 @@ __revision__ = "$Id$" import sys import os +from sysconfig import get_python_version, get_platform + from distutils.core import Command -from distutils.util import get_platform from distutils.dir_util import remove_tree from distutils.errors import DistutilsOptionError, DistutilsPlatformError -from distutils.sysconfig import get_python_version from distutils import log class bdist_wininst(Command): |