ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-23 09:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
and bump zetuptoolz version to 0.6c16dev4. fixes #1405

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
This commit is contained in:
David-Sarah Hopwood
2013-03-17 16:42:59 +00:00
parent 5082ca46f4
commit 0e20ab6003
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -8,5 +8,5 @@ graft misc
graft static graft static
graft darcsver-1.7.2.egg graft darcsver-1.7.2.egg
graft setuptools-0.6c16dev3.egg graft setuptools-0.6c16dev4.egg
global-exclude *~ *.pyc global-exclude *~ *.pyc

2
setuptools-0.6c16dev3.egg/EGG-INFO/PKG-INFO
View File

@ -1,6 +1,6 @@
Metadata-Version: 1.0 Metadata-Version: 1.0
Name: setuptools Name: setuptools
Version: 0.6c16dev3 Version: 0.6c16dev4
Summary: Download, build, install, upgrade, and uninstall Python packages -- easily! (zetuptoolz fork) Summary: Download, build, install, upgrade, and uninstall Python packages -- easily! (zetuptoolz fork)
Home-page: http://pypi.python.org/pypi/setuptools Home-page: http://pypi.python.org/pypi/setuptools
Author: Phillip J. Eby Author: Phillip J. Eby

2
setuptools-0.6c16dev3.egg/setuptools/__init__.py
View File

@ -9,7 +9,7 @@ import os.path
import os import os
import sys import sys
__version__ = '0.6c16dev3' __version__ = '0.6c16dev4'
__all__ = [ __all__ = [
'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
'find_packages' 'find_packages'

10
setuptools-0.6c16dev3.egg/setuptools/dist.py
View File

@ -400,14 +400,14 @@ class Distribution(_Distribution):
def print_commands(self): def print_commands(self):
for ep in pkg_resources.iter_entry_points('distutils.commands'): for ep in pkg_resources.iter_entry_points('distutils.commands'):
if ep.name not in self.cmdclass: if ep.name not in self.cmdclass:
cmdclass = ep.load(False) # don't require extras, we're not running try:
self.cmdclass[ep.name] = cmdclass 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) return _Distribution.print_commands(self)
def _set_feature(self,name,status): def _set_feature(self,name,status):
"""Set feature's inclusion status""" """Set feature's inclusion status"""
setattr(self,self._feature_attrname(name),status) setattr(self,self._feature_attrname(name),status)

5
setuptools-0.6c16dev3.egg/zetuptoolz.txt
View File

@ -3,7 +3,7 @@ setuptools trunk r80621 (which is current as of 2010-08-31), with the following
differences: 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> <http://bugs.python.org/setuptools/issue17>
"easy_install will install a package that is already there" "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. (Note: this patch does not work as intended when site.py has been modified.
This will be fixed in a future version.) 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 * The following patch to setuptools introduced bugs, and has been reverted
in zetuptoolz: in zetuptoolz: