From: Łukasz Langa <lukasz@langa.pl>
Date: Sat, 26 Nov 2016 22:02:48 +0000 (-0800)
Subject: Merge 3.5, fix for #24142
X-Git-Tag: v3.6.0rc1~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fb4e421f41bda398e7d6e1f56b22d912609dc17;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5, fix for #24142
---

8fb4e421f41bda398e7d6e1f56b22d912609dc17
diff --cc Misc/NEWS
index 929ce5322b26,3b8ca5e68b81..c950383ce5c1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,31 -2,10 +2,34 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.5.3 release candidate 1?
 -===============================================
 +What's New in Python 3.6.0 release candidate 1
 +==============================================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking
 +  if the next instruction is YIELD_FROM. Regression introduced by WORDCODE
 +  (issue #26647).
 +
 +Library
 +-------
 +
++- Issue #24142: Reading a corrupt config file left configparser in an
++  invalid state.  Original patch by Florian Höch.
++
 +Tools/Demos
 +-----------
 +
 +- Issue #28023: Fix python-gdb.py didn't support new dict implementation.
 +
  
 -Release date: TBA
 +What's New in Python 3.6.0 beta 4
 +=================================
 +
 +*Release date: 2016-11-21*
  
  Core and Builtins
  -----------------