Tolerate import errors when loading extra commands for "setup.py --help-commands"

and bump zetuptoolz version to 0.6c16dev4. fixes #1405

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>

diff --git a/MANIFEST.in b/MANIFEST.in
index fdf768740c445b08b7bc1f53fa93ab832cd0475d..407b6814777b830b9df6de90c45a20e79b2e9524 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,5 +8,5 @@ graft misc
 graft static
 graft darcsver-1.7.2.egg
 
-graft setuptools-0.6c16dev3.egg
+graft setuptools-0.6c16dev4.egg
 global-exclude *~ *.pyc

diff --git a/setuptools-0.6c16dev3.egg/EGG-INFO/PKG-INFO b/setuptools-0.6c16dev3.egg/EGG-INFO/PKG-INFO
index c9df489da25e56d6ecd9cc34e6e62c748a9e27d0..f8c5e16641ce0b992c63ca2aa2a82e8adf172e69 100644 (file)
--- a/setuptools-0.6c16dev3.egg/EGG-INFO/PKG-INFO
+++ b/setuptools-0.6c16dev3.egg/EGG-INFO/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: setuptools
-Version: 0.6c16dev3
+Version: 0.6c16dev4
 Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!  (zetuptoolz fork)
 Home-page: http://pypi.python.org/pypi/setuptools
 Author: Phillip J. Eby

diff --git a/setuptools-0.6c16dev3.egg/setuptools/__init__.py b/setuptools-0.6c16dev3.egg/setuptools/__init__.py
index d57448f41bab14bb1e60e3543cf5ee4bbcbd143f..8b4f1cacc943b00d6356b64fc59a6fc3a28ffe58 100644 (file)
--- a/setuptools-0.6c16dev3.egg/setuptools/__init__.py
+++ b/setuptools-0.6c16dev3.egg/setuptools/__init__.py
@@ -9,7 +9,7 @@ import os.path
 import os
 import sys
 
-__version__ = '0.6c16dev3'
+__version__ = '0.6c16dev4'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

diff --git a/setuptools-0.6c16dev3.egg/setuptools/dist.py b/setuptools-0.6c16dev3.egg/setuptools/dist.py
index 482c6bf2fed39e605da518bce24b3c5350661748..aff5b2a26320960a0eb0d5121cdefee8b7cdc7aa 100644 (file)
--- a/setuptools-0.6c16dev3.egg/setuptools/dist.py
+++ b/setuptools-0.6c16dev3.egg/setuptools/dist.py
@@ -400,14 +400,14 @@ class Distribution(_Distribution):
     def print_commands(self):
         for ep in pkg_resources.iter_entry_points('distutils.commands'):
             if ep.name not in self.cmdclass:
-                cmdclass = ep.load(False) # don't require extras, we're not running
-                self.cmdclass[ep.name] = cmdclass
+                try:
+                    cmdclass = ep.load(False) # don't require extras, we're not running
+                    self.cmdclass[ep.name] = cmdclass
+                except ImportError:
+                    pass # see https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1405
         return _Distribution.print_commands(self)
 
 
-
-
-
     def _set_feature(self,name,status):
         """Set feature's inclusion status"""
         setattr(self,self._feature_attrname(name),status)

diff --git a/setuptools-0.6c16dev3.egg/zetuptoolz.txt b/setuptools-0.6c16dev3.egg/zetuptoolz.txt
index 25c029d09c264c331ebe79702e2e66e47db383f8..b4729c7f3554691e14ffb0efa7935f7260124f17 100644 (file)
--- a/setuptools-0.6c16dev3.egg/zetuptoolz.txt
+++ b/setuptools-0.6c16dev3.egg/zetuptoolz.txt
@@ -3,7 +3,7 @@ setuptools trunk r80621 (which is current as of 2010-08-31), with the following
 differences:
 
 
- * Zooko's patches for the following bugs and features have been applied:
+ * Zooko's and David-Sarah's patches for the following bugs and features have been applied:
  
      <http://bugs.python.org/setuptools/issue17>
      "easy_install will install a package that is already there"
@@ -16,6 +16,9 @@ differences:
      (Note: this patch does not work as intended when site.py has been modified.
      This will be fixed in a future version.)
 
+     <https://tahoe-lafs.org/trac/zetuptoolz/ticket/4>
+     "python setup.py --help-commands raises exception due to conflict with distribute"
+
 
  * The following patch to setuptools introduced bugs, and has been reverted
    in zetuptoolz: