From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 3 Mar 2012 01:38:37 +0000 (+0100)
Subject: - Issue #14177: marshal.loads() now raises TypeError when given an unicode
X-Git-Tag: v3.3.0a1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d3a003f241460e417f2108fecf990b7ce5d1449;p=python

- Issue #14177: marshal.loads() now raises TypeError when given an unicode
  string.  Patch by Guilherme Gonçalves.
---

0d3a003f241460e417f2108fecf990b7ce5d1449
diff --cc Misc/ACKS
index 57b611075d,00288772b2..17ea9198fe
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -367,11 -339,9 +367,12 @@@ Dinu Gherma
  Jonathan Giddy
  Johannes Gijsbers
  Michael Gilfix
 +Yannick Gingras
 +Michael Goderbauer
  Christoph Gohlke
  Tim Golden
+ Guilherme Gonçalves
 +Tiago Gonçalves
  Chris Gonnerman
  David Goodger
  Hans de Graaff
diff --cc Misc/NEWS
index 1e16f96419,d6298400b4..7607e6651f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -511,9 -130,9 +511,12 @@@ Core and Builtin
  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.
 +
  - 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