summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2013-12-07 09:09:27 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2013-12-07 09:09:27 (GMT)
commitd05c9ff84501d93b13de40a9c7b0360c7d2ebada (patch)
treeae840ca5e91d21e53cc60e6c3e7fdd64b5a9fec4 /Misc
parentee07b94788e5e3e79f6632e92a5295adc3937bf4 (diff)
downloadcpython-d05c9ff84501d93b13de40a9c7b0360c7d2ebada.zip
cpython-d05c9ff84501d93b13de40a9c7b0360c7d2ebada.tar.gz
cpython-d05c9ff84501d93b13de40a9c7b0360c7d2ebada.tar.bz2
Issue #6784: Strings from Python 2 can now be unpickled as bytes objects.
Initial patch by Merlijn van Deen. I've added a few unrelated docstring fixes in the patch while I was at it, which makes the documentation for pickle a bit more consistent.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 5e60f9b..798aaa0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -293,6 +293,7 @@ Kushal Das
Jonathan Dasteel
Pierre-Yves David
A. Jesse Jiryu Davis
+Merlijn van Deen
John DeGood
Ned Deily
Vincent Delft
diff --git a/Misc/NEWS b/Misc/NEWS
index 58c4eec..f623a19 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,10 @@ Library
- Issue #19296: Silence compiler warning in dbm_open
+- Issue #6784: Strings from Python 2 can now be unpickled as bytes
+ objects by setting the encoding argument of Unpickler to be 'bytes'.
+ Initial patch by Merlijn van Deen.
+
- Issue #19839: Fix regression in bz2 module's handling of non-bzip2 data at
EOF, and analogous bug in lzma module.