diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-02-03 02:59:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-02-03 02:59:43 (GMT) |
| commit | d69fe2a8d3f618150a61e3679a4d370e5979efd4 (patch) | |
| tree | e0775e007ce033f4a7bfd31d0ff056c5f8a0b3d6 /Lib/distutils/command/bdist_msi.py | |
| parent | f044812f9bfa66197f1fc67e5c81d4dbee31e267 (diff) | |
| download | cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.zip cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.tar.gz cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.tar.bz2 | |
Merged revisions 77712,77740-77741,77756,77886,77902,77936 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77712 | tarek.ziade | 2010-01-23 11:52:57 -0600 (Sat, 23 Jan 2010) | 1 line
fixed the 64bits tests for get_platform() - mac osx
........
r77740 | benjamin.peterson | 2010-01-24 21:58:21 -0600 (Sun, 24 Jan 2010) | 1 line
compare types with is not ==
........
r77741 | facundo.batista | 2010-01-25 00:15:01 -0600 (Mon, 25 Jan 2010) | 3 lines
Added a note about Event.is_set() syntax being new to 2.6
........
r77756 | tarek.ziade | 2010-01-26 11:20:37 -0600 (Tue, 26 Jan 2010) | 1 line
fixed bdist_msi imports and added a test module for distutils.command.bdist_msi
........
r77886 | benjamin.peterson | 2010-01-31 12:09:34 -0600 (Sun, 31 Jan 2010) | 1 line
move distutils.rst to different toc
........
r77902 | andrew.kuchling | 2010-01-31 20:04:26 -0600 (Sun, 31 Jan 2010) | 1 line
Add various items
........
r77936 | andrew.kuchling | 2010-02-02 20:19:14 -0600 (Tue, 02 Feb 2010) | 1 line
Add various items
........
Diffstat (limited to 'Lib/distutils/command/bdist_msi.py')
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index 404f215..f13c73b 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -7,15 +7,12 @@ Implements the bdist_msi command. """ import sys, os -from sysconfig import get_python_version +from sysconfig import get_python_version, get_platform -import sys, os from distutils.core import Command from distutils.dir_util import remove_tree -from distutils.sysconfig import get_python_version from distutils.version import StrictVersion from distutils.errors import DistutilsOptionError -from distutils.util import get_platform from distutils import log import msilib |