Update to 1.4:

Version 1.4
-----------

- Update linkify to use etree type Treeewalker instead of simpletree.
- Updated html5lib to version >= 0.999.
- Update all code to be compatible with Python 3 and 2 using six.
- Switch to Apache License.


Version 1.3
-----------

- Used by Python 3-only fork.


Version 1.2.2
-------------

- Pin html5lib to version 0.95 for now due to major API break.

Version 1.2.1
-------------

- clean() no longer considers "feed:" an acceptable protocol due to
  inconsistencies in browser behavior.


Version 1.2
-----------

- linkify() has changed considerably. Many keyword arguments have been
  replaced with a single callbacks list. Please see the documentation
  for more information.
- Bleach will no longer consider unacceptable protocols when linkifying.
- linkify() now takes a tokenizer argument that allows it to skip
  sanitization.
- delinkify() is gone.
- Removed exception handling from _render. clean() and linkify() may now
  throw.
- linkify() correctly ignores case for protocols and domain names.
- linkify() correctly handles markup within an <a> tag.

3 files changed, 13 insertions, 13 deletions

diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index dae504e9487..dcc31b015e3 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2013/01/12 12:11:40 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/01/19 18:51:18 wiz Exp $
 
-DISTNAME=	bleach-1.1.5
-PKGREVISION=	1
+DISTNAME=	bleach-1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://pypi.python.org/packages/source/b/bleach/
@@ -13,7 +11,6 @@ COMMENT=	Easy whitelist-based HTML-sanitizing tool
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 
 USE_LANGUAGES=	# none
diff --git a/www/py-bleach/PLIST b/www/py-bleach/PLIST
index 9074b7a7b8a..0b82cf8b140 100644
--- a/www/py-bleach/PLIST
+++ b/www/py-bleach/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/01/12 12:11:40 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/01/19 18:51:18 wiz Exp $
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
@@ -8,6 +8,9 @@ ${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/bleach/__init__.py
 ${PYSITELIB}/bleach/__init__.pyc
 ${PYSITELIB}/bleach/__init__.pyo
+${PYSITELIB}/bleach/callbacks.py
+${PYSITELIB}/bleach/callbacks.pyc
+${PYSITELIB}/bleach/callbacks.pyo
 ${PYSITELIB}/bleach/encoding.py
 ${PYSITELIB}/bleach/encoding.pyc
 ${PYSITELIB}/bleach/encoding.pyo
@@ -23,9 +26,6 @@ ${PYSITELIB}/bleach/tests/test_basics.pyo
 ${PYSITELIB}/bleach/tests/test_css.py
 ${PYSITELIB}/bleach/tests/test_css.pyc
 ${PYSITELIB}/bleach/tests/test_css.pyo
-${PYSITELIB}/bleach/tests/test_delinkify.py
-${PYSITELIB}/bleach/tests/test_delinkify.pyc
-${PYSITELIB}/bleach/tests/test_delinkify.pyo
 ${PYSITELIB}/bleach/tests/test_links.py
 ${PYSITELIB}/bleach/tests/test_links.pyc
 ${PYSITELIB}/bleach/tests/test_links.pyo
@@ -35,3 +35,6 @@ ${PYSITELIB}/bleach/tests/test_security.pyo
 ${PYSITELIB}/bleach/tests/test_unicode.py
 ${PYSITELIB}/bleach/tests/test_unicode.pyc
 ${PYSITELIB}/bleach/tests/test_unicode.pyo
+${PYSITELIB}/bleach/tests/tools.py
+${PYSITELIB}/bleach/tests/tools.pyc
+${PYSITELIB}/bleach/tests/tools.pyo
diff --git a/www/py-bleach/distinfo b/www/py-bleach/distinfo
index 52d3374ea12..06bb720a947 100644
--- a/www/py-bleach/distinfo
+++ b/www/py-bleach/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2013/01/03 14:04:46 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/01/19 18:51:18 wiz Exp $
 
-SHA1 (bleach-1.1.5.tar.gz) = c9c5ea22a1a2ef4c6804f9ed8138c2d9ad6a23d4
-RMD160 (bleach-1.1.5.tar.gz) = e04d88113f96f3612611d2919d1894f33ef10c3e
-Size (bleach-1.1.5.tar.gz) = 18344 bytes
+SHA1 (bleach-1.4.tar.gz) = a53274c39f9fd8753e3d522f897ad17bb7cf74c9
+RMD160 (bleach-1.4.tar.gz) = 8b507825d337231537d140b13c9821da77c9d853
+Size (bleach-1.4.tar.gz) = 17454 bytes