From edaba3eb30c78631cbd642ed9a07586d5b3414ab Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Thu, 13 Feb 2020 23:41:58 +0100 Subject: [PATCH 1/2] remove obsoletes python2-html2text from epel7 --- python-html2text.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-html2text.spec b/python-html2text.spec index 98fa2f7..a36a787 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -7,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_sum} License: GPLv3 @@ -28,7 +28,7 @@ BuildRequires: python3-pytest %package -n python3-%{upname} Summary: %{common_sum} Provides: %{upname} = %{version}-%{release} -Obsoletes: python2-%{upname} <= %{version}-%{release} +Obsoletes: python2-%{upname} < 2019.8.11 %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} @@ -79,6 +79,9 @@ popd %changelog +* Thu Feb 13 2020 David Kaufmann - 2019.9.26-3 +- allow keeping python2-html2text in epel7 + * Tue Oct 29 2019 Sérgio Basto - 2019.9.26-2 - Python3 only this version remove support for Python <= 3.4 From a436fdae76c7c43e77d77676f31cb55476c63afd Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sun, 6 Dec 2020 01:42:43 +0100 Subject: [PATCH 2/2] python3-only version 2019.9.26, working --- python-html2text.spec | 6 ++++-- python3-string-encoding.patch | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 python3-string-encoding.patch diff --git a/python-html2text.spec b/python-html2text.spec index a36a787..5adfc9e 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -14,12 +14,14 @@ License: GPLv3 URL: http://alir3z4.github.io/%{upname} Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz +Patch0: python3-string-encoding.patch + BuildArch: noarch BuildRequires: help2man BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python3-pytest +BuildRequires: python%{python3_pkgversion}-pytest %description %{common_desc} @@ -36,7 +38,7 @@ Obsoletes: python2-%{upname} < 2019.8.11 %prep -%autosetup -n %{upname}-%{version} +%autosetup -n %{upname}-%{version} -p1 %{__rm} -fr *.egg-info diff --git a/python3-string-encoding.patch b/python3-string-encoding.patch new file mode 100644 index 0000000..83d9327 --- /dev/null +++ b/python3-string-encoding.patch @@ -0,0 +1,21 @@ +--- html2text-2019.9.26/html2text/cli.py.orig 2020-12-04 21:03:13.896696602 +0100 ++++ html2text-2019.9.26/html2text/cli.py 2020-12-06 01:29:03.649034019 +0100 +@@ -260,6 +260,8 @@ + + try: + data = data.decode(args.encoding, args.decode_errors) ++ except AttributeError: ++ pass + except UnicodeDecodeError as err: + warning = bcolors.WARNING + "Warning:" + bcolors.ENDC + warning += " Use the " + bcolors.OKGREEN +@@ -303,4 +305,8 @@ + h.open_quote = args.open_quote + h.close_quote = args.close_quote + +- sys.stdout.write(h.handle(data)) ++ handled_data = h.handle(data) ++ try: ++ sys.stdout.write(handled_data) ++ except UnicodeEncodeError: ++ sys.stdout.buffer.write(handled_data.encode('utf-8'))