summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-03-03 01:35:32 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-03-03 01:35:32 (GMT)
commit4a90ef03637fdc1bc63ee9be82fbf22cbaa68662 (patch)
treef6424020b09897e21e82740669a5ea1d2583e9da /Misc
parent679e9d36f78de3ac18abaaddbcf4f73fcef55b7e (diff)
downloadcpython-4a90ef03637fdc1bc63ee9be82fbf22cbaa68662.zip
cpython-4a90ef03637fdc1bc63ee9be82fbf22cbaa68662.tar.gz
cpython-4a90ef03637fdc1bc63ee9be82fbf22cbaa68662.tar.bz2
Issue #14177: marshal.loads() now raises TypeError when given an unicode string.
Patch by Guilherme Gonçalves.
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 3f9cff9..0028877 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -341,6 +341,7 @@ Johannes Gijsbers
Michael Gilfix
Christoph Gohlke
Tim Golden
+Guilherme Gonçalves
Chris Gonnerman
David Goodger
Hans de Graaff
diff --git a/Misc/NEWS b/Misc/NEWS
index 9c854a2..d629840 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -130,6 +130,9 @@ Core and Builtins
Library
-------
+- Issue #14177: marshal.loads() now raises TypeError when given an unicode
+ string. Patch by Guilherme Gonçalves.
+
- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary,
WeakValueDictionary) to return a better approximation when some objects
are dead or dying. Moreover, the implementation is now O(1) rather than