Issue #18010: Merge pydoc web search fix from 3.4 into 3.5

diff --cc Lib/pydoc.py
Simple merge

diff --cc Lib/test/test_pydoc.py
Simple merge

diff --cc Misc/NEWS
index f2ce94afe691e7a14b47b444de0298f2cfecac43,d47737051f1552df672b64791b196a925bb440bd..e20c33d3cd6a6bac3a9382a54d507ec5e277eb85
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -54,8 -96,9 +54,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #18010: Fix the pydoc web server's module search function to handle
+   exceptions from importing packages.
+ 
 +- Issue #25554: Got rid of circular references in regular expression parsing.
 +
  - Issue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
    at the end if the FileInput was opened with binary mode.
    Patch by Ryosuke Ito.