diff options
| -rw-r--r-- | distutils2/_backport/__init__.py | 2 | ||||
| -rw-r--r-- | distutils2/install.py | 5 | ||||
| -rw-r--r-- | distutils2/tests/support.py | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/distutils2/_backport/__init__.py b/distutils2/_backport/__init__.py index bc0791f..ce6f11b 100644 --- a/distutils2/_backport/__init__.py +++ b/distutils2/_backport/__init__.py @@ -1,4 +1,4 @@ -"""Modules copied from the Python 3.2 standard library. +"""Modules copied from Python 3 standard libraries. Individual classes and objects like the any function are in compat. """ diff --git a/distutils2/install.py b/distutils2/install.py index 99927de..91cbd7a 100644 --- a/distutils2/install.py +++ b/distutils2/install.py @@ -10,7 +10,6 @@ import os import sys import stat import errno -import shutil import logging import tempfile @@ -27,7 +26,7 @@ from distutils2.errors import (PackagingError, InstallationException, InstallationConflict, CCompilerError) from distutils2.pypi.errors import ProjectNotFound, ReleaseNotFound from distutils2 import database -from distutils2._backport.shutil import unpack_archive +from distutils2._backport import shutil from distutils2._backport.sysconfig import (get_config_var, get_path, is_python_build) @@ -126,7 +125,7 @@ def install_local_project(path): logger.info('Installing from archive: %r', path) _unpacked_dir = tempfile.mkdtemp() try: - unpack_archive(path, _unpacked_dir) + shutil.unpack_archive(path, _unpacked_dir) return _run_install_from_archive(_unpacked_dir) finally: shutil.rmtree(_unpacked_dir) diff --git a/distutils2/tests/support.py b/distutils2/tests/support.py index 57ad3d5..6098c80 100644 --- a/distutils2/tests/support.py +++ b/distutils2/tests/support.py @@ -351,6 +351,7 @@ def fixup_build_ext(cmd): if runshared is None: cmd.library_dirs = ['.'] else: + # FIXME no partition in 2.4 name, equals, value = runshared.partition('=') cmd.library_dirs = value.split(os.pathsep) |