[PATCH] Improve the robustness of "pydoc -k" in the face of broken modules

Lib/pydoc.py

 #!/usr/bin/env python
 # -*- coding: latin-1 -*-
 """Generate Python documentation in HTML or text for interactive use.
 
 In the Python interpreter, do "from pydoc import help" to provide online
 help.  Calling help(thing) on a Python object documents the object.
 
 Or, at the shell command line outside of Python:
 
 Run "pydoc <name>" to show documentation on something.  <name> may be
@@ skipping 1943 matching lines @@
 
         if completer:
             completer()
 
 def apropos(key):
     """Print all the one-line module summaries that contain a substring."""
     def callback(path, modname, desc):
         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
 
 def serve(port, callback=None, completer=None):
     import BaseHTTPServer, mimetools, select
 
     # Patch up mimetools.Message so it doesn't break if rfc822 is reloaded.
     class Message(mimetools.Message):
         def __init__(self, fp, seekable=1):
             Message = self.__class__
@@ skipping 348 matching lines @@
 %s -g
     Pop up a graphical interface for finding and serving documentation.
 
 %s -w <name> ...
     Write out the HTML documentation for a module to a file in the current
     directory.  If <name> contains a '%s', it is treated as a filename; if
     it names a directory, documentation is written for all the contents.
 """ % (cmd, os.sep, cmd, cmd, cmd, cmd, os.sep)
 
 if __name__ == '__main__': cli()