[Python-checkins] distutils2: merge tarek changes.

[tarek.ziade]

tarek.ziade pushed 4a41a15d1f9f to distutils2:

http://hg.python.org/distutils2/rev/4a41a15d1f9f
changeset:   924:4a41a15d1f9f
parent:      923:e26de21a7b4e
parent:      921:59285ae1fc70
user:        Alexis Metaireau <alexis at notmyidea.org>
date:        Fri Jan 28 12:45:38 2011 +0100
summary:
  merge tarek changes.

files:
  distutils2/install.py
  distutils2/run.py
  distutils2/tests/pypi_server.py
  distutils2/version.py

diff --git a/distutils2/install.py b/distutils2/install.py
--- a/distutils2/install.py
+++ b/distutils2/install.py
@@ -3,8 +3,6 @@
 import os
 import errno
 import itertools
-import sys
-import tarfile
 
 from distutils2 import logger
 from distutils2._backport.pkgutil import get_distributions
@@ -57,7 +55,7 @@
             else:
                 raise e
         os.rename(old, new)
-        yield old, new
+        yield (old, new)
 
 
 def _install_dist(dist, path):
@@ -261,8 +259,6 @@
         logger.info('Could not find a matching project')
         return infos
 
-    import pdb; pdb.set_trace()
-
     # this works for Metadata 1.2
     metadata = release.fetch_metadata()
 
diff --git a/distutils2/run.py b/distutils2/run.py
--- a/distutils2/run.py
+++ b/distutils2/run.py
@@ -152,6 +152,10 @@
                   action="store", dest="install",
                   help="Install a project.")
 
+    parser.add_option("-r", "--remove",
+                  action="store", dest="remove",
+                  help="Remove a project.")
+
     options, args = parser.parse_args()
     if options.version:
         print('Distutils2 %s' % __version__)
diff --git a/distutils2/tests/pypi_server.py b/distutils2/tests/pypi_server.py
--- a/distutils2/tests/pypi_server.py
+++ b/distutils2/tests/pypi_server.py
@@ -375,6 +375,7 @@
 
     def __init__(self, dists=[]):
         self._dists = dists
+        self._search_result = []
 
     def add_distributions(self, dists):
         for dist in dists:

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