--- a/src/reportlab/lib/utils.orig.py 2020-02-28 22:34:38.874971726 +0100
+++ b/src/reportlab/lib/utils.py 2020-02-28 22:41:45.003662464 +0100
@@ -7,7 +7,7 @@
import os, sys, time, types, datetime, ast
from functools import reduce as functools_reduce
literal_eval = ast.literal_eval
-from base64 import decodestring as base64_decodestring, encodestring as base64_encodestring
+from base64 import decodebytes as base64_decodebytes, encodebytes as base64_encodebytes
from reportlab import isPy3
from reportlab.lib.logger import warnOnce
from reportlab.lib.rltempfile import get_rl_tempfile, get_rl_tempdir, _rl_getuid
@@ -124,10 +124,10 @@
return str(x).encode(enc)
def encode_label(args):
- return base64_encodestring(pickle.dumps(args)).strip().decode('latin1')
+ return base64_encodebytes(pickle.dumps(args)).strip().decode('latin1')
def decode_label(label):
- return pickle.loads(base64_decodestring(label.encode('latin1')))
+ return pickle.loads(base64_decodebytes(label.encode('latin1')))
def rawUnicode(s):
'''converts first 256 unicodes 1-1'''
@@ -221,10 +221,10 @@
from string import letters as ascii_letters, uppercase as ascii_uppercase, lowercase as ascii_lowercase
def encode_label(args):
- return base64_encodestring(pickle.dumps(args)).strip()
+ return base64_encodebytes(pickle.dumps(args)).strip()
def decode_label(label):
- return pickle.loads(base64_decodestring(label))
+ return pickle.loads(base64_decodebytes(label))
def rawUnicode(s):
'''converts first 256 unicodes 1-1'''
--- a/src/reportlab/graphics/testshapes.orig.py 2020-02-28 22:34:38.792972171 +0100
+++ b/src/reportlab/graphics/testshapes.py 2020-02-28 22:53:35.028836858 +0100
@@ -455,7 +455,7 @@
'''create a small PIL image'''
from reportlab.graphics.renderPM import _getImage
from reportlab.lib.utils import getBytesIO
- b = base64.decodestring(b'''R0lGODdhCgAHAIMAAP/////29v/d3f+ysv9/f/9VVf9MTP8iIv8ICP8AAAAAAAAAAAAAAAAAAAAA
+ b = base64.decodebytes(b'''R0lGODdhCgAHAIMAAP/////29v/d3f+ysv9/f/9VVf9MTP8iIv8ICP8AAAAAAAAAAAAAAAAAAAAA
AAAAACwAAAAACgAHAAAIMwABCBxIsKABAQASFli4MAECAgEAJJhIceKBAQkyasx4YECBjx8TICAQ
AIDJkwYEAFgZEAA7''')
return _getImage().open(getBytesIO(b))