Compare commits

..

No commits in common. "1ae0470a6c5747e77bec650e2fd471cf2f36e45a" and "f153f0f1c172dae7c6e6e1939b5a1387b25ce8f7" have entirely different histories.

4 changed files with 64 additions and 13 deletions

Binary file not shown.

44
collections-abc.patch Normal file
View File

@ -0,0 +1,44 @@
From 322a2d57bfdc52a9ce14bee93f9abb372cc08487 Mon Sep 17 00:00:00 2001
From: 5j9 <5j9@users.noreply.github.com>
Date: Sun, 23 Sep 2018 11:32:46 +0330
Subject: [PATCH] Try to import MutableMapping from collections.abc
Note that collections.abc has been added in Python 3.3.
Fixes #402
---
html5lib/_trie/_base.py | 5 ++++-
html5lib/treebuilders/dom.py | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py
index a1158bbb..6b71975f 100644
--- a/html5lib/_trie/_base.py
+++ b/html5lib/_trie/_base.py
@@ -1,6 +1,9 @@
from __future__ import absolute_import, division, unicode_literals
-from collections import Mapping
+try:
+ from collections.abc import Mapping
+except ImportError: # Python 2.7
+ from collections import Mapping
class Trie(Mapping):
diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py
index dcfac220..d8b53004 100644
--- a/html5lib/treebuilders/dom.py
+++ b/html5lib/treebuilders/dom.py
@@ -1,7 +1,10 @@
from __future__ import absolute_import, division, unicode_literals
-from collections import MutableMapping
+try:
+ from collections.abc import MutableMapping
+except ImportError: # Python 2.7
+ from collections import MutableMapping
from xml.dom import minidom, Node
import weakref

Binary file not shown.

View File

@ -1,12 +1,12 @@
Name: python-html5lib
Version: 1.1
Release: 1
Version: 1.0.1
Release: 6
Epoch: 1
Summary: HTML parser based on the WHAT-WG Web Applications 1
License: MIT
URL: https://github.com/html5lib/html5lib-python
Source0: https://github.com/html5lib/html5lib-python/archive/%{version}.tar.gz
Source0: https://github.com/html5lib/html5lib-python/archive/html5lib-python-%{version}.tar.gz
Patch0: collections-abc.patch
BuildArch: noarch
@ -16,6 +16,15 @@ BuildArch: noarch
Html5lib is a pure-python library for parsing HTML. It is designed to conform
to the WHATWG HTML specification, as is implemented by all major web browsers.
#%%package -n python2-html5lib
#Summary: python2 package for html5lib
#BuildRequires: python2-devel python2-setuptools python2-mock python2-pytest python2-six
#BuildRequires: python2-webencodings python2-chardet python2-genshi python2-lxml
#%%{?python_provide:%python_provide python2-html5lib}
#%%description -n python2-html5lib
#python2 package for html5lib.
%package -n python3-html5lib
Summary: python3 package for html5lib
@ -32,11 +41,18 @@ python3 package for html5lib.
%autosetup -n html5lib-python-%{version} -p1
%build
#%%py2_build
%py3_build
%install
#%%py2_install
%py3_install
#%files -n python2-html5lib
#%defattr(-,root,root)
#%license LICENSE
#%{python2_sitelib}/*
%files -n python3-html5lib
%defattr(-,root,root)
%license LICENSE
@ -47,15 +63,6 @@ python3 package for html5lib.
%doc CHANGES.rst README.rst
%changelog
* Wed Jan 27 2021 zhanzhimin <zhanzhimin@huawei.com> - 1.1-1
- update to 1.1
* Thu Sep 10 2020 chengguipeng<chengguipeng1@huawei.com> - 1.0.1-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:modify source0 url
* Wed Jul 15 2020 zhouhaibo <zhouhaibo@huawei.com> - 1.0.1-6
- Type:bugfix
- Id:NA