Index: head/www/py-bleach/Makefile
===================================================================
--- head/www/py-bleach/Makefile	(revision 502891)
+++ head/www/py-bleach/Makefile	(revision 502892)
@@ -1,29 +1,33 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bleach
-PORTVERSION=	2.1.3
+PORTVERSION=	3.1.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Easy whitelist-based HTML-sanitizing tool
+COMMENT=	Easy safelist-based HTML-sanitizing tool
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}html5lib>=0.99999999:www/py-html5lib@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
+# This is a development script
+# TODO: Remove from sdist (via MANIFEST.ini)
+post-extract:
+	${RM} ${WRKSRC}/bleach/_vendor/pip_install_vendor.sh
+
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
Index: head/www/py-bleach/distinfo
===================================================================
--- head/www/py-bleach/distinfo	(revision 502891)
+++ head/www/py-bleach/distinfo	(revision 502892)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526364338
-SHA256 (bleach-2.1.3.tar.gz) = eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44
-SIZE (bleach-2.1.3.tar.gz) = 60141
+TIMESTAMP = 1559046690
+SHA256 (bleach-3.1.0.tar.gz) = 3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa
+SIZE (bleach-3.1.0.tar.gz) = 167814
Index: head/www/py-bleach/pkg-descr
===================================================================
--- head/www/py-bleach/pkg-descr	(revision 502891)
+++ head/www/py-bleach/pkg-descr	(revision 502892)
@@ -1,5 +1,5 @@
 Bleach is a Python HTML sanitizing library that escapes or strips markup and
 attributes based on a white list. Bleach is intended for sanitizing text from
 untrusted sources.
 
-WWW: https://github.com/jsocol/bleach
+WWW: https://github.com/mozilla/bleach