summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-03-03 01:38:37 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-03-03 01:38:37 (GMT)
commit0d3a003f241460e417f2108fecf990b7ce5d1449 (patch)
tree8f773e6a59bd4a5244f1025b870d294ccd4eb17e /Misc
parent135b6d8aa5a24b08170fd94114a80dfeb1ae963c (diff)
parent4a90ef03637fdc1bc63ee9be82fbf22cbaa68662 (diff)
downloadcpython-0d3a003f241460e417f2108fecf990b7ce5d1449.zip
cpython-0d3a003f241460e417f2108fecf990b7ce5d1449.tar.gz
cpython-0d3a003f241460e417f2108fecf990b7ce5d1449.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 57b61107..17ea919 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -371,6 +371,7 @@ Yannick Gingras
Michael Goderbauer
Christoph Gohlke
Tim Golden
+Guilherme Gonçalves
Tiago Gonçalves
Chris Gonnerman
David Goodger
diff --git a/Misc/NEWS b/Misc/NEWS
index 1e16f96..7607e66 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -511,6 +511,9 @@ Core and Builtins
Library
-------
+- Issue #14177: marshal.loads() now raises TypeError when given an unicode
+ string. Patch by Guilherme Gonçalves.
+
- Issue #13550: Remove the debug machinery from the threading module: remove
verbose arguments from all threading classes and functions.