From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 7 Sep 2015 05:27:42 +0000 (-0700)
Subject: Merge from 3.5.0 branch.
X-Git-Tag: v3.5.1rc1~427^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f35bd306ffa2c05a1297435bb15cd3b4d47b3977;p=python

Merge from 3.5.0 branch.
---

f35bd306ffa2c05a1297435bb15cd3b4d47b3977
diff --cc Misc/NEWS
index 64c9af75bc,e30e36e8da..8a09be790a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -95,9 -20,13 +98,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #24917: time_strftime() buffer over-read.
 +- Issue #23144: Make sure that HTMLParser.feed() returns all the data, even
 +  when convert_charrefs is True.
  
+ - Issue #24748: To resolve a compatibility problem found with py2exe and
+   pywin32, imp.load_dynamic() once again ignores previously loaded modules
+   to support Python modules replacing themselves with extension modules.
+   Patch by Petr Viktorin.
+ 
  - Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
    would return True once, then False on subsequent calls.