[gentoo-commits] repo/gentoo:master commit in: dev-python/html5lib/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/html5lib/files/

[Michał Górny]

commit:     ab9ade98f4508946e4f9dc0acab4ded74c2362c4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 19:00:13 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 19:06:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9ade98

dev-python/html5lib: Commit missing patch

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/html5lib-1.0.1-collections-abc.patch     | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
new file mode 100644
index 00000000000..d5a9dcac299
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch
@@ -0,0 +1,44 @@
+From 4f9235752cea29c5a31721440578b430823a1e69 Mon Sep 17 00:00:00 2001
+From: 5j9 <5j9@users.noreply.github.com>
+Date: Mon, 1 Oct 2018 15:02:33 +0330
+Subject: [PATCH] Try to import MutableMapping from collections.abc (#403)
+
+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
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-python/html5lib/files/

[Zac Medico]

commit:     ee2530ebfe919efebea96356a99d4a9958acdf18
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 19:32:37 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 19:33:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2530eb

dev-python/html5lib: fix sanitizer patch to match upstream

See: https://github.com/html5lib/html5lib-python/commit/17499b9763a090f7715af49555d21fe4b558958b
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch b/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
index c64cbe1ab3f..2fbef2ad0b9 100644
--- a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
+++ b/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
@@ -5,7 +5,7 @@
                  if attr not in attrs:
                      continue
 -                val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
-+                val_unescaped = re.sub(r"[`\000-\040\177-\240\s]+", '',
++                val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
                                         unescape(attrs[attr])).lower()
                  # remove replacement characters from unescaped characters
                  val_unescaped = val_unescaped.replace("\ufffd", "")