From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 18 Jan 2016 19:35:22 +0000 (+0200)
Subject: Issue #26013: Added compatibility with broken protocol 2 pickles created
X-Git-Tag: v3.6.0a1~745^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=111c7b9011c5838f8276e8729bc8cbeb693d4ac7;p=thirdparty%2FPython%2Fcpython.git

Issue #26013: Added compatibility with broken protocol 2 pickles created
in old Python 3 versions (3.4.3 and lower).
---

diff --git a/Lib/_compat_pickle.py b/Lib/_compat_pickle.py
index 6e39d4aee3e8..c0e0443cf233 100644
--- a/Lib/_compat_pickle.py
+++ b/Lib/_compat_pickle.py
@@ -177,6 +177,13 @@ IMPORT_MAPPING.update({
     'DocXMLRPCServer': 'xmlrpc.server',
     'SimpleHTTPServer': 'http.server',
     'CGIHTTPServer': 'http.server',
+    # For compatibility with broken pickles saved in old Python 3 versions
+    'UserDict': 'collections',
+    'UserList': 'collections',
+    'UserString': 'collections',
+    'whichdb': 'dbm',
+    'StringIO':  'io',
+    'cStringIO': 'io',
 })
 
 REVERSE_IMPORT_MAPPING.update({
diff --git a/Misc/NEWS b/Misc/NEWS
index 735e420ac28d..69441424f1aa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #26013: Added compatibility with broken protocol 2 pickles created
+  in old Python 3 versions (3.4.3 and lower).
+
 - Issue #25850: Use cross-compilation by default for 64-bit Windows.
 
 - Issue #17633: Improve zipimport's support for namespace packages.