From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Sat, 30 Nov 2013 21:55:39 +0000 (-0800)
Subject: Merge with 3.3.
X-Git-Tag: v3.4.0b2~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1eedf9ff0c986f99321ffef8a65b153c126b86a;p=python

Merge with 3.3.
---

a1eedf9ff0c986f99321ffef8a65b153c126b86a
diff --cc Misc/NEWS
index 653b0f4326,cf4d39b6c7..6481de163f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -27,13 -21,9 +27,16 @@@ Librar
  - Issue #19088: Fixed incorrect caching of the copyreg module in
    object.__reduce__() and object.__reduce_ex__().
  
 +- Issue #19698: Removed exec_module() methods from
 +  importlib.machinery.BuiltinImporter and ExtensionFileLoader.
 +
+ - Fixed _pickle.Unpickler to not fail when loading empty strings as
+   persistent IDs.
+ 
 +- ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME.
 +
 +- Issue #19802: Add socket.SO_PRIORITY.
 +
  - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with
    virtual interface.  Original patch by Kent Frazier.