Hi, This diff updates py-html5lib to the latest release. Tested on amd64.
For tests need import py-test-expect (on ports@) Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/devel/py-html5lib/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 3 Jan 2017 19:19:48 -0000 1.13 +++ Makefile 25 May 2017 11:48:28 -0000 @@ -2,33 +2,35 @@ COMMENT= HTML parser/tokeniser based for HTML5 -MODPY_EGG_VERSION= 0.9999999 +MODPY_EGG_VERSION= 0.999999999 DISTNAME= html5lib-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} CATEGORIES= devel www textproc -REVISION= 1 HOMEPAGE= https://github.com/html5lib/html5lib-python/ -MAINTAINER = Sean Levy <att...@stalphonsos.com> +MAINTAINER = Sean Levy <att...@stalphonsos.com> # MIT PERMIT_PACKAGE_CDROM= Yes -PKG_ARCH= * MODULES= lang/python + MODPY_PI = Yes +MODPY_SETUPTOOLS = Yes -RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \ + textproc/py-webencodings${MODPY_FLAVOR} TEST_DEPENDS = ${RUN_DEPENDS} \ - devel/py-nose${MODPY_FLAVOR} \ + devel/py-test${MODPY_FLAVOR} \ + devel/py-test-expect${MODPY_FLAVOR} \ + textproc/py-chardet${MODPY_FLAVOR} \ textproc/py-lxml${MODPY_FLAVOR} FLAVORS = python3 FLAVOR ?= do-test: - cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} \ - --first-package-wins + cd ${WRKSRC} && ${MODPY_BIN} -m pytest .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/py-html5lib/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 1 Jan 2016 20:22:09 -0000 1.3 +++ distinfo 25 May 2017 11:48:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (html5lib-0.9999999.tar.gz) = JhKhkajVhCv6BX5BulC7udy3IkGdJAjHjP9HWNB1SGg= -SIZE (html5lib-0.9999999.tar.gz) = 889312 +SHA256 (html5lib-0.999999999.tar.gz) = 7nR8D/0wKNJyIGGTa1xl7k/hPI5GE1GbREcSP8RUYpg= +SIZE (html5lib-0.999999999.tar.gz) = 245488 Index: patches/patch-html5lib_ihatexml_py =================================================================== RCS file: patches/patch-html5lib_ihatexml_py diff -N patches/patch-html5lib_ihatexml_py --- patches/patch-html5lib_ihatexml_py 2 May 2016 18:10:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-html5lib_ihatexml_py,v 1.1 2016/05/02 18:10:09 danj Exp $ - -Backport of patch for comment issue: -https://github.com/html5lib/html5lib-python/commit/0c551c9519e47f76f8f185089ed71cb9539b6e00 ---- html5lib/ihatexml.py.orig Fri Apr 22 18:44:14 2016 -+++ html5lib/ihatexml.py Fri Apr 22 18:45:49 2016 -@@ -225,6 +225,9 @@ class InfosetFilter(object): - while "--" in data: - warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning) - data = data.replace("--", "- -") -+ if data.endswith("-"): -+ warnings.warn("Comments cannot end in a dash", DataLossWarning) -+ data += " " - return data - - def coerceCharacters(self, data): Index: patches/patch-html5lib_treebuilders_etree_lxml_py =================================================================== RCS file: patches/patch-html5lib_treebuilders_etree_lxml_py diff -N patches/patch-html5lib_treebuilders_etree_lxml_py --- patches/patch-html5lib_treebuilders_etree_lxml_py 2 May 2016 18:10:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -$OpenBSD: patch-html5lib_treebuilders_etree_lxml_py,v 1.1 2016/05/02 18:10:09 danj Exp $ - -Backport patch from HEAD to stop test fails due to py-lxml update to 3.6.0 -https://github.com/html5lib/html5lib-python/commit/0c551c9519e47f76f8f185089ed71cb9539b6e00 ---- html5lib/treebuilders/etree_lxml.py.orig Mon Sep 7 18:36:25 2015 -+++ html5lib/treebuilders/etree_lxml.py Fri Apr 22 18:50:50 2016 -@@ -54,7 +54,7 @@ class Document(object): - def testSerializer(element): - rv = [] - finalText = None -- infosetFilter = ihatexml.InfosetFilter() -+ infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True) - - def serializeElement(element, indent=0): - if not hasattr(element, "tag"): -@@ -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): -@@ -257,7 +257,7 @@ class TreeBuilder(_base.TreeBuilder): - 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 @@ class TreeBuilder(_base.TreeBuilder): - - # 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() Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-html5lib/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 1 Jan 2016 20:22:09 -0000 1.2 +++ pkg/PLIST 25 May 2017 11:48:28 -0000 @@ -1,61 +1,73 @@ @comment $OpenBSD: PLIST,v 1.2 2016/01/01 20:22:09 shadchin Exp $ lib/python${MODPY_VERSION}/site-packages/html5lib/ -lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt +lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/html5lib/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_ihatexml.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_inputstream.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_tokenizer.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}html5parser.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}ihatexml.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}inputstream.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/_ihatexml.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_inputstream.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_tokenizer.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/ +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}datrie.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/${MODPY_PYCACHE}py.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/_base.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/datrie.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_trie/py.py +lib/python${MODPY_VERSION}/site-packages/html5lib/_utils.py lib/python${MODPY_VERSION}/site-packages/html5lib/constants.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/ lib/python${MODPY_VERSION}/site-packages/html5lib/filters/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}alphabeticalattributes.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}inject_meta_charset.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}lint.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}optionaltags.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/filters/${MODPY_PYCACHE}whitespace.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/filters/_base.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/alphabeticalattributes.py +lib/python${MODPY_VERSION}/site-packages/html5lib/filters/base.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/inject_meta_charset.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/lint.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/optionaltags.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/sanitizer.py lib/python${MODPY_VERSION}/site-packages/html5lib/filters/whitespace.py lib/python${MODPY_VERSION}/site-packages/html5lib/html5parser.py -lib/python${MODPY_VERSION}/site-packages/html5lib/ihatexml.py -lib/python${MODPY_VERSION}/site-packages/html5lib/inputstream.py -lib/python${MODPY_VERSION}/site-packages/html5lib/sanitizer.py -lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/ -lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/__init__.py -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/${MODPY_PYCACHE}/ -lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/${MODPY_PYCACHE}htmlserializer.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/serializer/htmlserializer.py -lib/python${MODPY_VERSION}/site-packages/html5lib/tokenizer.py +lib/python${MODPY_VERSION}/site-packages/html5lib/serializer.py lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/ lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/${MODPY_PYCACHE}sax.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/genshi.py lib/python${MODPY_VERSION}/site-packages/html5lib/treeadapters/sax.py lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/ lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/_base.py +lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/base.py lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/dom.py lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/etree.py lib/python${MODPY_VERSION}/site-packages/html5lib/treebuilders/etree_lxml.py @@ -63,26 +75,13 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}dom.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}genshistream.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}lxmletree.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}pulldom.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/_base.py +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}etree_lxml.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/${MODPY_PYCACHE}genshi.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/base.py lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/dom.py lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/etree.py -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/genshistream.py -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/lxmletree.py -lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/pulldom.py -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/ -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/__init__.py -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html5lib/trie/${MODPY_PYCACHE}/ -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/${MODPY_PYCACHE}datrie.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/${MODPY_PYCACHE}py.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/_base.py -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/datrie.py -lib/python${MODPY_VERSION}/site-packages/html5lib/trie/py.py -lib/python${MODPY_VERSION}/site-packages/html5lib/utils.py +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/etree_lxml.py +lib/python${MODPY_VERSION}/site-packages/html5lib/treewalkers/genshi.py