- Issue #14177: marshal.loads() now raises TypeError when given an unicode

  string.  Patch by Guilherme Gonçalves.

diff --cc Lib/test/test_exceptions.py
Simple merge

diff --cc Lib/test/test_marshal.py
Simple merge

diff --cc Misc/ACKS
index 57b611075d53562a1f9ba0a9ea9bca78fd8179e5,00288772b24456aab1e4f6f14758407aaeacd18a..17ea9198fe99f1193a293c4af61773dbdee023cd
--- 1/Misc/ACKS
--- 2/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 1e16f964198a3a2ede24d26c15f288649cd482ea,d6298400b40fdd006191fad7ce334f8dca384358..7607e6651f3f468695cd5412882e422934ee87fc
--- 1/Misc/NEWS
--- 2/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

diff --cc Python/marshal.c
Simple merge