rpms/python/devel make-pydoc-more-robust-001.patch, NONE, 1.1 python.spec, 1.187, 1.188
dmalcolm
dmalcolm at fedoraproject.org
Thu May 27 15:37:54 UTC 2010
Author: dmalcolm
Update of /cvs/pkgs/rpms/python/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15916
Modified Files:
python.spec
Added Files:
make-pydoc-more-robust-001.patch
Log Message:
* Thu May 27 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.5-12
- make "pydoc -k" more robust in the face of broken modules (rhbz:461419, patch115)
make-pydoc-more-robust-001.patch:
pydoc.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE make-pydoc-more-robust-001.patch ---
Index: Lib/pydoc.py
===================================================================
--- Lib/pydoc.py (revision 76636)
+++ Lib/pydoc.py (working copy)
@@ -1961,10 +1961,14 @@
if modname[-9:] == '.__init__':
modname = modname[:-9] + ' (package)'
print modname, desc and '- ' + desc
+ def onerror(modname):
+ # Ignore non-ImportError exceptions raised whilst trying to
+ # import modules
+ pass
try: import warnings
except ImportError: pass
else: warnings.filterwarnings('ignore') # ignore problems during import
- ModuleScanner().run(callback, key)
+ ModuleScanner().run(callback, key, onerror=onerror)
# --------------------------------------------------- web browser interface
Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- python.spec 26 May 2010 10:28:54 -0000 1.187
+++ python.spec 27 May 2010 15:37:54 -0000 1.188
@@ -61,7 +61,7 @@ Summary: An interpreted, interactive, ob
Name: %{python}
# Remember to also rebase python-docs when changing this:
Version: 2.6.5
-Release: 11%{?dist}
+Release: 12%{?dist}
License: Python
Group: Development/Languages
Provides: python-abi = %{pybasever}
@@ -377,6 +377,10 @@ Patch113: python-2.6.5-more-configuratio
# (rhbz:553020); partially upstream as http://bugs.python.org/issue7647
Patch114: python-2.6.5-statvfs-f_flag-constants.patch
+# Make "pydoc -k" more robust in the face of broken modules
+# (rhbz:461419; patch sent upstream as http://bugs.python.org/issue7425 )
+Patch115: make-pydoc-more-robust-001.patch
+
%if %{main_python}
Obsoletes: Distutils
Provides: Distutils
@@ -608,6 +612,8 @@ rm -r Modules/zlib || exit 1
%patch114 -p1 -b .statvfs-f-flag-constants
+%patch115 -p0
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -1306,6 +1312,9 @@ rm -fr %{buildroot}
# payload file would be unpackaged)
%changelog
+* Thu May 27 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.5-12
+- make "pydoc -k" more robust in the face of broken modules (rhbz:461419, patch115)
+
* Wed May 26 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.5-11
- add flags for statvfs.f_flag to the constant list in posixmodule (i.e. "os")
(patch 114)
More information about the scm-commits
mailing list