changeset:   98995:1ab20d3c9dc6
branch:      2.7
parent:      98977:92dda5f00b0f
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sat Nov 07 05:41:47 2015 +0000
files:       Lib/pydoc.py Misc/NEWS
description:
Issue #18010: Fix pydoc GUI search to handle package exceptions


diff -r 92dda5f00b0f -r 1ab20d3c9dc6 Lib/pydoc.py
--- a/Lib/pydoc.py	Thu Nov 05 20:41:57 2015 +0100
+++ b/Lib/pydoc.py	Sat Nov 07 05:41:47 2015 +0000
@@ -2244,8 +2244,11 @@
             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__':
diff -r 92dda5f00b0f -r 1ab20d3c9dc6 Misc/NEWS
--- a/Misc/NEWS	Thu Nov 05 20:41:57 2015 +0100
+++ b/Misc/NEWS	Sat Nov 07 05:41:47 2015 +0000
@@ -46,6 +46,9 @@
 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