Remove use of cPickle patch from Claude Paroz < claude at 2xlibre dot net >
authorrobin
Mon, 07 Feb 2022 10:00:39 +0000
changeset 4700 00db6fe0b8d9
parent 4699 223c337e8b11
child 4701 4e838f952b70
Remove use of cPickle patch from Claude Paroz < claude at 2xlibre dot net >
CHANGES.md
src/reportlab/lib/fontfinder.py
src/reportlab/lib/utils.py
--- a/CHANGES.md	Tue Jan 25 11:31:16 2022 +0000
+++ b/CHANGES.md	Mon Feb 07 10:00:39 2022 +0000
@@ -11,6 +11,10 @@
 The contributors lists are in no order and apologies to those accidentally not
 mentioned. If we missed you, please let us know!
 
+CHANGES  3.6.7	 07/02/2022
+---------------------------
+	* Remove use of cPickle patch from Claude Paroz < claude at 2xlibre dot net >
+
 CHANGES  3.6.6	 24/01/2022
 ---------------------------
 	* remove uniChr alias of chr (patch contribution from Claude Paroz)
--- a/src/reportlab/lib/fontfinder.py	Tue Jan 25 11:31:16 2022 +0000
+++ b/src/reportlab/lib/fontfinder.py	Mon Feb 07 10:00:39 2022 +0000
@@ -58,8 +58,8 @@
 Future plans might include using this to auto-register fonts; and making it
 update itself smartly on repeated instantiation.
 """
-import sys, os, tempfile
-from reportlab.lib.utils import pickle, asNative as _asNative
+import sys, os, pickle, tempfile
+from reportlab.lib.utils import asNative as _asNative
 from xml.sax.saxutils import quoteattr
 from reportlab.lib.utils import asBytes
 try:
--- a/src/reportlab/lib/utils.py	Tue Jan 25 11:31:16 2022 +0000
+++ b/src/reportlab/lib/utils.py	Mon Feb 07 10:00:39 2022 +0000
@@ -4,7 +4,7 @@
 __version__='3.5.34'
 __doc__='''Gazillions of miscellaneous internal utility functions'''
 
-import os, sys, time, types, datetime, ast, importlib
+import os, pickle, sys, time, types, datetime, ast, importlib
 from functools import reduce as functools_reduce
 literal_eval = ast.literal_eval
 try:
@@ -26,11 +26,6 @@
 __UNSET__ = __UNSET__()
 
 try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-
-try:
     from hashlib import md5
 except ImportError:
     import md5