From: Łukasz Langa <lukasz@langa.pl>
Date: Sat, 26 Nov 2016 22:04:40 +0000 (-0800)
Subject: Merge 3.6, fix for #24142
X-Git-Tag: v3.7.0a1~1876
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7;p=python

Merge 3.6, fix for #24142
---

de7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7
diff --cc Misc/NEWS
index 385af89d73,c950383ce5..c18d787e67
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -409,6 -490,6 +409,9 @@@ Librar
  
  - Issue #27972: Prohibit Tasks to await on themselves.
  
++- Issue #24142: Reading a corrupt config file left configparser in an
++  invalid state.  Original patch by Florian Höch.
++
  Windows
  -------