diff --git a/.gitignore b/.gitignore index fff9a54..a04e75e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /defusedxml-0.4.tar.gz /defusedxml-0.4.1.tar.gz /defusedxml-0.5.0.tar.gz +/defusedxml-0.6.0.tar.gz diff --git a/python-defusedxml.spec b/python-defusedxml.spec index aaaa7e4..27dc675 100644 --- a/python-defusedxml.spec +++ b/python-defusedxml.spec @@ -13,13 +13,12 @@ %{!?_licensedir:%global license %%doc} Name: python-%{pypi_name} -Version: 0.5.0 -Release: 7%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: XML bomb protection for Python stdlib modules License: Python URL: https://github.com/tiran/defusedxml Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Patch1: %{url}/pull/35/commits/730872cc3a8a4467e9c7fa07063bfa9b20a790c5.patch#/python38.patch BuildArch: noarch @@ -111,26 +110,29 @@ module. This is the python%{python3_other_pkgversion} build. %files -n python2-%{pypi_name} %doc README.txt README.html CHANGES.txt %license LICENSE -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python2_sitelib}/%{pypi_name}/ +%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info/ %if 0%{with_python3} %files -n python%{python3_pkgversion}-%{pypi_name} %doc README.txt README.html CHANGES.txt %license LICENSE -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}/ +%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info/ %if 0%{?with_python3_other} %files -n python%{python3_other_pkgversion}-%{pypi_name} %doc README.txt README.html CHANGES.txt %license LICENSE -%{python3_other_sitelib}/%{pypi_name} -%{python3__other_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_other_sitelib}/%{pypi_name}/ +%{python3__other_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info/ %endif # with_python3_other %endif # with_python3 %changelog +* Thu May 09 2019 Miro HronĨok - 0.6.0-1 +- Update to 0.6.0 (#1699639) + * Sat Feb 02 2019 Fedora Release Engineering - 0.5.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/python38.patch b/python38.patch deleted file mode 100644 index 6d30e6c..0000000 --- a/python38.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 730872cc3a8a4467e9c7fa07063bfa9b20a790c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Wed, 10 Apr 2019 13:56:16 +0200 -Subject: [PATCH] Handle Python 3.8 XMLParser html argument removal - -Fixes https://github.com/tiran/defusedxml/issues/34 ---- - defusedxml/ElementTree.py | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/defusedxml/ElementTree.py b/defusedxml/ElementTree.py -index 41b2ea8..5c49c4e 100644 ---- a/defusedxml/ElementTree.py -+++ b/defusedxml/ElementTree.py -@@ -61,11 +61,15 @@ def _get_py3_cls(): - - class DefusedXMLParser(_XMLParser): - -- def __init__(self, html=0, target=None, encoding=None, -+ def __init__(self, html=None, target=None, encoding=None, - forbid_dtd=False, forbid_entities=True, - forbid_external=True): -- # Python 2.x old style class -- _XMLParser.__init__(self, html, target, encoding) -+ # Since Python 3.8, the html argument is not supported, -+ # so we only pass it when we got it - the TypeError will propagate -+ if html is None: -+ _XMLParser.__init__(self, target=target, encoding=encoding) -+ else: -+ _XMLParser.__init__(self, html, target=target, encoding=encoding) - self.forbid_dtd = forbid_dtd - self.forbid_entities = forbid_entities - self.forbid_external = forbid_external diff --git a/sources b/sources index ecd9540..6d596b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (defusedxml-0.5.0.tar.gz) = 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452 +SHA512 (defusedxml-0.6.0.tar.gz) = dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226