From: Brett Cannon <brett@python.org>
Date: Sun, 21 Feb 2016 02:37:04 +0000 (-0800)
Subject: Merge for issue #26186
X-Git-Tag: v3.6.0a1~592
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5f4d3c2460bdedfcff196cb7399e407db69aa73;p=thirdparty%2FPython%2Fcpython.git

Merge for issue #26186
---

e5f4d3c2460bdedfcff196cb7399e407db69aa73
diff --cc Misc/NEWS
index 646978b1ecbe,66d96132f3b0..6c1e83f4c6fc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -183,9 -72,13 +183,12 @@@ Core and Builtin
  - Issue #25887: Raise a RuntimeError when a coroutine object is awaited
    more than once.
  
 -
  Library
  -------
+ 
 -- Issue #26186: Remove an invalid type check in importlib.util.LazyLoader.
++Issue #26186: Remove an invalid type check in importlib.util.LazyLoader.
+ 
 -- Issue #26367: importlib.__init__() raises RuntimeError like
 +- Issue #26367: importlib.__init__() raises ImportError like
    builtins.__import__() when ``level`` is specified but without an accompanying
    package specified.