summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-09-18 21:14:55 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-09-18 21:14:55 (GMT)
commit332d7217509443c01ba5c3da41053786b49015fa (patch)
treecf45b0faef4cd93224f5c13d309c1844d2ebe356 /Misc
parent2985dbb52613f97b982987f980c765781c00e657 (diff)
downloadcpython-332d7217509443c01ba5c3da41053786b49015fa.zip
cpython-332d7217509443c01ba5c3da41053786b49015fa.tar.gz
cpython-332d7217509443c01ba5c3da41053786b49015fa.tar.bz2
add keyword arguments support to str/unicode encode and decode #6300
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 53e386a..e0bd435 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -88,6 +88,7 @@ Peter Bosch
Eric Bouck
Thierry Bousch
Sebastian Boving
+Jeff Bradberry
Monty Brandenberg
Georg Brandl
Christopher Brannon
diff --git a/Misc/NEWS b/Misc/NEWS
index 0ce1168..66ee553 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
+- Issue #6300: unicode.encode, unicode.docode, str.decode, and str.encode now
+ take keyword arguments.
+
- Issue #6922: Fix an infinite loop when trying to decode an invalid
UTF-32 stream with a non-raising error handler like "replace" or "ignore".