Issue #18010: Merge pydoc web search fix from 3.5

diff --cc Lib/pydoc.py
index f4f253010f49d35994376dacf03dfba99d6a4600,a9c04f0728f77f0471c525674da89a7603b22aa4..a73298d7157235c30b23fe1605473d3980c86df8
mode 100644,100755..100644
--- 1/Lib/pydoc.py
--- 2/Lib/pydoc.py
+++ b/Lib/pydoc.py

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

diff --cc Misc/NEWS
index 26ca26ba0cb4657e7eb7f58debe949bf45d61d64,e20c33d3cd6a6bac3a9382a54d507ec5e277eb85..e42df939def9470967090f90d85d0b3d3918a4cd
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -72,11 -54,11 +72,14 @@@ 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 #18973: Command-line interface of the calendar module now uses argparse
 +  instead of optparse.
 +
  - 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.