From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 6 Nov 2015 01:08:34 +0000 (+0000)
Subject: Issue #18010: Merge pydoc web search fix from 3.5
X-Git-Tag: v3.6.0a1~1115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e0deec45f9dad96aff67cbce0830674feeca0c;p=python

Issue #18010: Merge pydoc web search fix from 3.5
---

e2e0deec45f9dad96aff67cbce0830674feeca0c
diff --cc Lib/pydoc.py
index f4f253010f,a9c04f0728..a73298d715
mode 100644,100755..100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
diff --cc Misc/NEWS
index 26ca26ba0c,e20c33d3cd..e42df939de
--- a/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.