summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2016-11-26 22:04:40 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2016-11-26 22:04:40 (GMT)
commitde7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7 (patch)
treee773d848730074aabc6c462e069b83ff34a2635c /Misc
parentd80c3fb17bec4dd32129a331b5bd77b5e248d588 (diff)
parent8fb4e421f41bda398e7d6e1f56b22d912609dc17 (diff)
downloadcpython-de7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7.zip
cpython-de7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7.tar.gz
cpython-de7bf086d2a77f5c963b8a97e1ac9d9bdeff14c7.tar.bz2
Merge 3.6, fix for #24142
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b8c9dde..72ff0e7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -664,6 +664,7 @@ Jeremy Hylton
Ludwig Hähne
Gerhard Häring
Fredrik Håård
+Florian Höch
Catalin Iacob
Mihai Ibanescu
Ali Ikinci
diff --git a/Misc/NEWS b/Misc/NEWS
index 385af89..c18d787 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -409,6 +409,9 @@ Library
- 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
-------