python3-only version 2019.9.26, working

This commit is contained in:
David Kaufmann 2020-12-06 01:42:43 +01:00
commit a436fdae76
2 changed files with 25 additions and 2 deletions

View file

@ -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

View file

@ -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'))