From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 6 Nov 2015 00:51:38 +0000 (+0000)
Subject: Issue #18010: Merge pydoc web search fix from 3.4 into 3.5
X-Git-Tag: v3.5.1rc1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98da9d0e0de8300e1362aacb213e450c977d28dc;p=python

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

98da9d0e0de8300e1362aacb213e450c977d28dc
diff --cc Misc/NEWS
index f2ce94afe6,d47737051f..e20c33d3cd
--- a/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.