From 8fcdcec5fbdd0e3a77391e4f354218014f59f358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2018 20:45:13 +0000 Subject: gentoo resync : 05.01.2018 --- dev-python/html5lib/Manifest | 3 - .../html5lib-0.9999999-lxml-3.5.0-backport.patch | 117 --------------------- ...html5lib-0.9999999-python3.6-sanitizer-re.patch | 50 --------- dev-python/html5lib/html5lib-0.9999999-r2.ebuild | 32 ------ 4 files changed, 202 deletions(-) delete mode 100644 dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch delete mode 100644 dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch delete mode 100644 dev-python/html5lib/html5lib-0.9999999-r2.ebuild (limited to 'dev-python/html5lib') diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest index 3c43ce38f515..fedc1220527f 100644 --- a/dev-python/html5lib/Manifest +++ b/dev-python/html5lib/Manifest @@ -1,8 +1,5 @@ -AUX html5lib-0.9999999-lxml-3.5.0-backport.patch 4654 BLAKE2B 218ead350fa0d9a0191207c6d7c60ce10103ff3a453302e52a9eef9f0db20e98a371f6b6759edf3fca8e027b7fd491a4e1ecf8397f4e78588cb6dc2ce0676375 SHA512 bcaddd8dfd71c943b472028b7c21cf913d58e6093d5f15fc280597d3d01e8a7d96a27f976e5b94b6289d0ea6ed4756abaf1bc382a4c48b95c65aedd2992aed05 -AUX html5lib-0.9999999-python3.6-sanitizer-re.patch 2591 BLAKE2B 4abc5adec94c93cbd32ae515e2b5a6f8d783e51f7ea800329e78f695fa2c5682b33d52a11cbda12d2ecf1e2554ac35577f011c245757efa24a669fedfce6cb48 SHA512 c95e2a4a4f1fd1e376a6af7710c6ed94747e54de8d1f1c6233f56405405011c2f9fcebb93e5dfd19589148387a62abe856e7d55b0d0014ca931b337e825c35ce DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0 -EBUILD html5lib-0.9999999-r2.ebuild 927 BLAKE2B d1719d772dae2203b98b7f8e19ecc4df8973d36a233aed31764e6f04a7cc94ce79bcbcc0f8890f41e427c1801aefc975b1f80478f04fae005e9fcbdfbf29a94c SHA512 adb8a68a96e5d785dfb9490209f0c54e549a322eabc62f8887021754dee30de5df6bcfbb060220d6cf483ac9ad2a1fc9c77db4beaf794f1c1404d0d039e1c716 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0 EBUILD html5lib-0.999999999.ebuild 879 BLAKE2B 5c40d502b03171403ab0bbee8e24890cfcef366e537d83128ac6464675162817db53b089b1c6866f2296ada8c55fe6a842312b152faaa4391a43067ca5736db7 SHA512 b97ad3d5d8953fdfd5527a4f04e67c67eb9131d54c3d5155600a03f115c45855853e1061f5ab9ac6f747ed980268258726ef3ad6aa15736b400e95428090dc55 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a diff --git a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch deleted file mode 100644 index fecfab9a4fb4..000000000000 --- a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 46046c0f7125911ff8205f09a7574573bb953105 Mon Sep 17 00:00:00 2001 -From: Geoffrey Sneddon -Date: Mon, 23 Nov 2015 15:17:07 +0000 -Subject: [PATCH 1/3] Make lxml tree-builder coerce comments to work with lxml - 3.5. - ---- - html5lib/ihatexml.py | 2 ++ - html5lib/treebuilders/etree_lxml.py | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py -index 0fc7930..b5b2e98 100644 ---- a/html5lib/ihatexml.py -+++ b/html5lib/ihatexml.py -@@ -225,6 +225,8 @@ def coerceComment(self, data): - while "--" in data: - warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning) - data = data.replace("--", "- -") -+ if data.endswith("-"): -+ data += " " - return data - - def coerceCharacters(self, data): -diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py -index 35d08ef..17007e3 100644 ---- a/html5lib/treebuilders/etree_lxml.py -+++ b/html5lib/treebuilders/etree_lxml.py -@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder): - - def __init__(self, namespaceHTMLElements, fullTree=False): - builder = etree_builders.getETreeModule(etree, fullTree=fullTree) -- infosetFilter = self.infosetFilter = ihatexml.InfosetFilter() -+ infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True) - self.namespaceHTMLElements = namespaceHTMLElements - - class Attributes(dict): - -From 1c22e1ce93dd4acc81a66cfa03cf9720fbd741c7 Mon Sep 17 00:00:00 2001 -From: Geoffrey Sneddon -Date: Mon, 23 Nov 2015 15:35:21 +0000 -Subject: [PATCH 2/3] fixup! Make lxml tree-builder coerce comments to work - with lxml 3.5. - ---- - html5lib/ihatexml.py | 1 + - html5lib/treebuilders/etree_lxml.py | 7 ++++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py -index b5b2e98..5a81a12 100644 ---- a/html5lib/ihatexml.py -+++ b/html5lib/ihatexml.py -@@ -226,6 +226,7 @@ def coerceComment(self, data): - warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning) - data = data.replace("--", "- -") - if data.endswith("-"): -+ warnings.warn("Comments cannot contain end in a dash", DataLossWarning) - data += " " - return data - -diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py -index 17007e3..c6c981f 100644 ---- a/html5lib/treebuilders/etree_lxml.py -+++ b/html5lib/treebuilders/etree_lxml.py -@@ -54,7 +54,7 @@ def _getChildNodes(self): - def testSerializer(element): - rv = [] - finalText = None -- infosetFilter = ihatexml.InfosetFilter() -+ infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True) - - def serializeElement(element, indent=0): - if not hasattr(element, "tag"): -@@ -257,7 +257,7 @@ def _getData(self): - data = property(_getData, _setData) - - self.elementClass = Element -- self.commentClass = builder.Comment -+ self.commentClass = Comment - # self.fragmentClass = builder.DocumentFragment - _base.TreeBuilder.__init__(self, namespaceHTMLElements) - -@@ -344,7 +344,8 @@ def insertRoot(self, token): - - # Append the initial comments: - for comment_token in self.initial_comments: -- root.addprevious(etree.Comment(comment_token["data"])) -+ comment = self.commentClass(comment_token["data"]) -+ root.addprevious(comment._element) - - # Create the root document and add the ElementTree to it - self.document = self.documentClass() - -From 235a6d7ac7e0a3e2b431766e051094c2d3110ba3 Mon Sep 17 00:00:00 2001 -From: Geoffrey Sneddon -Date: Mon, 23 Nov 2015 15:42:12 +0000 -Subject: [PATCH 3/3] fixup! Make lxml tree-builder coerce comments to work - with lxml 3.5. - ---- - html5lib/ihatexml.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py -index 5a81a12..5da5d93 100644 ---- a/html5lib/ihatexml.py -+++ b/html5lib/ihatexml.py -@@ -226,7 +226,7 @@ def coerceComment(self, data): - warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning) - data = data.replace("--", "- -") - if data.endswith("-"): -- warnings.warn("Comments cannot contain end in a dash", DataLossWarning) -+ warnings.warn("Comments cannot end in a dash", DataLossWarning) - data += " " - return data - 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 deleted file mode 100644 index 2fbef2ad0b9e..000000000000 --- a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/html5lib/sanitizer.py -+++ b/html5lib/sanitizer.py -@@ -203,7 +203,7 @@ - for attr in self.attr_val_is_uri: - if attr not in attrs: - continue -- val_unescaped = re.sub("[`\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", "") -@@ -228,7 +228,7 @@ - ' ', - unescape(attrs[attr])) - if (token["name"] in self.svg_allow_local_href and -- 'xlink:href' in attrs and re.search('^\s*[^#\s].*', -+ 'xlink:href' in attrs and re.search(r'^\s*[^#\s].*', - attrs['xlink:href'])): - del attrs['xlink:href'] - if 'style' in attrs: -@@ -257,16 +257,16 @@ - - def sanitize_css(self, style): - # disallow urls -- style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style) -+ style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style) - - # gauntlet -- if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style): -+ if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style): - return '' -- if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style): -+ if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style): - return '' - - clean = [] -- for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style): -+ for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style): - if not value: - continue - if prop.lower() in self.allowed_css_properties: -@@ -275,7 +275,7 @@ - 'padding']: - for keyword in value.split(): - if keyword not in self.acceptable_css_keywords and \ -- not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword): -+ not re.match(r"^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword): - break - else: - clean.append(prop + ': ' + value + ';') diff --git a/dev-python/html5lib/html5lib-0.9999999-r2.ebuild b/dev-python/html5lib/html5lib-0.9999999-r2.ebuild deleted file mode 100644 index 5b23d984fc3e..000000000000 --- a/dev-python/html5lib/html5lib-0.9999999-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-lxml-3.5.0-backport.patch - "${FILESDIR}"/${P}-python3.6-sanitizer-re.patch -) - -python_test() { - nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}" -} -- cgit v1.2.3