summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command/install.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-01-29 11:46:31 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-01-29 11:46:31 (GMT)
commit8b441d0dcdb9380e999f0caead087c4365cb0bdd (patch)
tree6afac21467fdfacecb62658f96fc847aace4731b /Lib/distutils/command/install.py
parentedacea30e457e151611a9fe560120cedb3bdc527 (diff)
downloadcpython-8b441d0dcdb9380e999f0caead087c4365cb0bdd.zip
cpython-8b441d0dcdb9380e999f0caead087c4365cb0bdd.tar.gz
cpython-8b441d0dcdb9380e999f0caead087c4365cb0bdd.tar.bz2
Merged revisions 77759,77761 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77759 | tarek.ziade | 2010-01-26 22:21:54 +0100 (Tue, 26 Jan 2010) | 1 line reintroduced the names in Distutils for APIs that were relocated ........ r77761 | tarek.ziade | 2010-01-26 23:46:15 +0100 (Tue, 26 Jan 2010) | 1 line added local get_platform/set_platform APIs in distutils.sysconfig ........
Diffstat (limited to 'Lib/distutils/command/install.py')
-rw-r--r--Lib/distutils/command/install.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 1f8d238..2a6d4dd 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -7,15 +7,14 @@ __revision__ = "$Id$"
import sys
import os
-from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
- get_config_var)
+from sysconfig import get_config_vars, get_paths, get_path, get_config_var
from distutils import log
from distutils.core import Command
from distutils.debug import DEBUG
from distutils.errors import DistutilsPlatformError
from distutils.file_util import write_file
-from distutils.util import convert_path, change_root
+from distutils.util import convert_path, change_root, get_platform
from distutils.errors import DistutilsOptionError
def _subst_vars(s, local_vars):