py-bleach: updated to 3.0.2

Version 3.0.2:

Bug fixes

 Merge Characters tokens after sanitizing them. This fixes issues in the
  LinkifyFilter where it was only linkifying parts of urls.


Version 3.0.1:

Features

 Support Python 3.7. It supported Python 3.7 just fine, but we added 3.7 to
  the list of Python environments we test so this is now officially supported.

Bug fixes

 Fix list object has no attribute lower in clean.
 Fix abbr getting escaped in linkify.


Version 3.0.0:

Backwards incompatible changes

 A bunch of functions were moved from one module to another.

  These were moved from bleach.sanitizer to bleach.html5lib_shim:

   convert_entity
   convert_entities
   match_entity
   next_possible_entity
   BleachHTMLSerializer
   BleachHTMLTokenizer
   BleachHTMLParser

  These functions and classes weren't documented and aren't part of the
  public API, but people read code and might be using them so we're
  considering it an incompatible API change.

  If you're using them, you'll need to update your code.

Features

 Bleach no longer depends on html5lib. html5lib==1.0.1 is now vendored into
  Bleach. You can remove it from your requirements file if none of your other
  requirements require html5lib.

  This means Bleach will now work fine with other libraries that depend on
  html5lib regardless of what version of html5lib they require.

Bug fixes
 Fixed tags getting added when using clean or linkify. This was a
  long-standing regression from the Bleach 2.0 rewrite.

 Fixed <isindex> getting replaced with a string. Now it gets escaped or
  stripped depending on whether it's in the allowed tags or not.

3 files changed, 128 insertions, 9 deletions

diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index b52d99b2c22..bb46a479da2 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2018/10/02 09:02:09 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/10/26 09:11:54 adam Exp $
 
-DISTNAME=	bleach-2.1.4
+DISTNAME=	bleach-3.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/bleach/}
@@ -10,8 +10,8 @@ HOMEPAGE=	https://github.com/mozilla/bleach
 COMMENT=	Easy whitelist-based HTML-sanitizing tool
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-html5lib>=0.99999999:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-webencodings-[0-9]*:../../textproc/py-webencodings
 BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner>=2.0:../../devel/py-test-runner
 TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.0.0:../../devel/py-test
 
diff --git a/www/py-bleach/PLIST b/www/py-bleach/PLIST
index cbbee16927c..d0a1bf553b6 100644
--- a/www/py-bleach/PLIST
+++ b/www/py-bleach/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/10/05 12:58:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/10/26 09:11:54 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -8,9 +8,128 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/bleach/__init__.py
 ${PYSITELIB}/bleach/__init__.pyc
 ${PYSITELIB}/bleach/__init__.pyo
+${PYSITELIB}/bleach/_vendor/README.rst
+${PYSITELIB}/bleach/_vendor/__init__.py
+${PYSITELIB}/bleach/_vendor/__init__.pyc
+${PYSITELIB}/bleach/_vendor/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/DESCRIPTION.rst
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/INSTALLER
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/LICENSE.txt
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/METADATA
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/RECORD
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/WHEEL
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/metadata.json
+${PYSITELIB}/bleach/_vendor/html5lib-1.0.1.dist-info/top_level.txt
+${PYSITELIB}/bleach/_vendor/html5lib/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_ihatexml.py
+${PYSITELIB}/bleach/_vendor/html5lib/_ihatexml.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_ihatexml.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_inputstream.py
+${PYSITELIB}/bleach/_vendor/html5lib/_inputstream.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_inputstream.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_tokenizer.py
+${PYSITELIB}/bleach/_vendor/html5lib/_tokenizer.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_tokenizer.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/_base.py
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/_base.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/_base.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/datrie.py
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/datrie.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/datrie.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/py.py
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/py.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_trie/py.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/_utils.py
+${PYSITELIB}/bleach/_vendor/html5lib/_utils.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/_utils.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/constants.py
+${PYSITELIB}/bleach/_vendor/html5lib/constants.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/constants.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/alphabeticalattributes.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/alphabeticalattributes.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/alphabeticalattributes.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/base.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/base.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/base.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/inject_meta_charset.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/inject_meta_charset.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/inject_meta_charset.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/lint.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/lint.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/lint.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/optionaltags.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/optionaltags.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/optionaltags.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/sanitizer.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/sanitizer.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/sanitizer.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/filters/whitespace.py
+${PYSITELIB}/bleach/_vendor/html5lib/filters/whitespace.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/filters/whitespace.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/html5parser.py
+${PYSITELIB}/bleach/_vendor/html5lib/html5parser.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/html5parser.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/serializer.py
+${PYSITELIB}/bleach/_vendor/html5lib/serializer.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/serializer.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/genshi.py
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/genshi.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/genshi.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/sax.py
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/sax.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treeadapters/sax.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/base.py
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/base.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/base.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/dom.py
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/dom.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/dom.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree.py
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree_lxml.py
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree_lxml.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treebuilders/etree_lxml.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/__init__.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/__init__.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/__init__.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/base.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/base.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/base.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/dom.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/dom.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/dom.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree_lxml.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree_lxml.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/etree_lxml.pyo
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/genshi.py
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/genshi.pyc
+${PYSITELIB}/bleach/_vendor/html5lib/treewalkers/genshi.pyo
+${PYSITELIB}/bleach/_vendor/pip_install_vendor.sh
+${PYSITELIB}/bleach/_vendor/vendor.txt
 ${PYSITELIB}/bleach/callbacks.py
 ${PYSITELIB}/bleach/callbacks.pyc
 ${PYSITELIB}/bleach/callbacks.pyo
+${PYSITELIB}/bleach/html5lib_shim.py
+${PYSITELIB}/bleach/html5lib_shim.pyc
+${PYSITELIB}/bleach/html5lib_shim.pyo
 ${PYSITELIB}/bleach/linkifier.py
 ${PYSITELIB}/bleach/linkifier.pyc
 ${PYSITELIB}/bleach/linkifier.pyo
diff --git a/www/py-bleach/distinfo b/www/py-bleach/distinfo
index 56a782c0b13..2cc58ec06d3 100644
--- a/www/py-bleach/distinfo
+++ b/www/py-bleach/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2018/10/02 09:02:09 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/10/26 09:11:54 adam Exp $
 
-SHA1 (bleach-2.1.4.tar.gz) = a540061933bb8edff25ff01bedcf41b903b3e845
-RMD160 (bleach-2.1.4.tar.gz) = 513c760d7460423e6f789c0b7387c4070eec60d3
-SHA512 (bleach-2.1.4.tar.gz) = 51a9240808eeb71ca05b47c5406ec81742028d848d97290f0b2990fdd6766dd0e1ea0e7ee037b68949160d533cd09c8bee5c0ce142a652044cc5b37a1e46a2e9
-Size (bleach-2.1.4.tar.gz) = 61521 bytes
+SHA1 (bleach-3.0.2.tar.gz) = e7ee75050ccace055d5040010e3fdfb8e2535a3a
+RMD160 (bleach-3.0.2.tar.gz) = 56c205f477a43e4b9d8d13145b7b6d86adbb7dc9
+SHA512 (bleach-3.0.2.tar.gz) = f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
+Size (bleach-3.0.2.tar.gz) = 165682 bytes