From 9fe780309cfc3d3449d3b836dcbeb3edbf807b90 Mon Sep 17 00:00:00 2001 From: sagitter Date: Feb 29 2020 11:47:43 +0000 Subject: Patched for Python-3.9 (rhbz#1808508) --- diff --git a/python-reportlab-3.5.34_python39.patch b/python-reportlab-3.5.34_python39.patch new file mode 100644 index 0000000..e099d84 --- /dev/null +++ b/python-reportlab-3.5.34_python39.patch @@ -0,0 +1,48 @@ +--- 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)) diff --git a/python-reportlab.spec b/python-reportlab.spec index e724116..1149497 100644 --- a/python-reportlab.spec +++ b/python-reportlab.spec @@ -13,18 +13,17 @@ %if 0%{?fedora} < 32 %global with_python2 1 %endif -%if 0%{?fedora} >= 32 -Obsoletes: python2-reportlab < 0:%{version}-%{release} -%endif Name: python-%{pypi} Version: 3.5.34 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for generating PDFs and graphics License: BSD and GPLv2+ URL: https://www.reportlab.com/opensource/ Source0: https://pypi.python.org/packages/source/r/%{pypi}/%{pypi}-%{version}.tar.gz +Patch0: python-%{pypi}-3.5.34_python39.patch + BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: ghostscript @@ -64,6 +63,9 @@ Requires: dejavu-sans-fonts Requires: bitstream-vera-sans-fonts Requires: python3-pillow %{?python_provide:%python_provide python3-%{pypi}} +%if 0%{?fedora} >= 32 +Obsoletes: python2-reportlab < 0:%{version}-%{release} +%endif %description -n python3-%{pypi} This is the ReportLab PDF Toolkit. It allows rapid creation of rich PDF @@ -71,7 +73,11 @@ documents, and also creation of charts in a variety of bitmap and vector formats. %prep -%autosetup -n %{pypi}-%{version} +%autosetup -n %{pypi}-%{version} -N + +%if 0%{?python3_version_nodots} == 39 +%patch0 -p1 -b .python39 +%endif # clean up hashbangs from libraries find src -name '*.py' | xargs sed -i -e '/^#!\//d' @@ -187,6 +193,9 @@ rm -f src/reportlab/graphics/__init__.py %{python3_sitearch}/reportlab-%{version}-py%{python3_version}.egg-info %changelog +* Fri Feb 28 2020 Antonio Trande - 3.5.34-4 +- Patched for Python-3.9 (rhbz#1808508) + * Thu Jan 30 2020 Fedora Release Engineering - 3.5.34-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild