[Python-checkins] distutils2: A few changes to match packaging

[eric.araujo]

http://hg.python.org/distutils2/rev/c9b22c0b5f3e
changeset:   1181:c9b22c0b5f3e
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Sep 19 15:11:51 2011 +0200
summary:
  A few changes to match packaging

files:
  distutils2/_backport/__init__.py |  2 +-
  distutils2/install.py            |  5 ++---
  distutils2/tests/support.py      |  1 +
  3 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/distutils2/_backport/__init__.py b/distutils2/_backport/__init__.py
--- 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
--- a/distutils2/install.py
+++ b/distutils2/install.py
@@ -10,7 +10,6 @@
 import sys
 import stat
 import errno
-import shutil
 import logging
 import tempfile
 
@@ -27,7 +26,7 @@
                                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 @@
         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
--- a/distutils2/tests/support.py
+++ b/distutils2/tests/support.py
@@ -351,6 +351,7 @@
         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)
 

-- 
Repository URL: http://hg.python.org/distutils2