]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #18010: Fix pydoc GUI search to handle package exceptions
authorMartin Panter <vadmium+py@gmail.com>
Sat, 7 Nov 2015 05:41:47 +0000 (05:41 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sat, 7 Nov 2015 05:41:47 +0000 (05:41 +0000)
Lib/pydoc.py
Misc/NEWS

index d7396f015d3c4ff5712f973de2d5be40f5eab5cc..9316fff1515017ebf30c39c34266f4c5c2808a75 100755 (executable)
@@ -2244,8 +2244,11 @@ def gui():
             if self.scanner:
                 self.scanner.quit = 1
             self.scanner = ModuleScanner()
+            def onerror(modname):
+                pass
             threading.Thread(target=self.scanner.run,
-                             args=(self.update, key, self.done)).start()
+                             args=(self.update, key, self.done),
+                             kwargs=dict(onerror=onerror)).start()
 
         def update(self, path, modname, desc):
             if modname[-9:] == '.__init__':
index c9dbb46545c118a5ba78bfba273d5178ff30c39b..6f056b2f33580f16f325698279fbc6c33783129f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #18010: Fix the pydoc GUI's search function to handle exceptions
+  from importing packages.
+
 - Issue #25515: Always use os.urandom as a source of randomness in uuid.uuid4.
 
 - Issue #21827: Fixed textwrap.dedent() for the case when largest common