From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 14 May 2018 22:21:10 +0000 (-0700)
Subject: bpo-33497: Add NEWS and ACKS entries. (GH-6838) (GH-6840)
X-Git-Tag: v3.7.0b5~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5195039bb5529f1b18d30e8bfcabdee739912d76;p=thirdparty%2FPython%2Fcpython.git

bpo-33497: Add NEWS and ACKS entries. (GH-6838) (GH-6840)

(cherry picked from commit d063b84d9ee435e9ae981c18faccaff5562792c3)

Co-authored-by: Ned Deily <nad@python.org>
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 0bb3f35d4915..9d6a9238c8a5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -206,6 +206,7 @@ Ammar Brohi
 Josh Bronson
 Daniel Brotsky
 Jean Brouwers
+Amber Brown
 Gary S. Brown
 Titus Brown
 Oleg Broytmann
diff --git a/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst b/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst
new file mode 100644
index 000000000000..d919dfdca75e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-05-14-17-49-34.bpo-33497.wWT6XM.rst
@@ -0,0 +1,2 @@
+Add errors param to cgi.parse_multipart and make an encoding in FieldStorage
+use the given errors (needed for Twisted).  Patch by Amber Brown.