Mon Jan 8 22:11:06 2018 UTC ()
Deal with py-html5lib API changes. Bump revision.


(joerg)
diff -r1.19 -r1.20 pkgsrc/print/py-pisa/Makefile
diff -r1.9 -r1.10 pkgsrc/print/py-pisa/distinfo
diff -r0 -r1.1 pkgsrc/print/py-pisa/patches/patch-sx_pisa3_pisa__context.py
diff -r0 -r1.1 pkgsrc/print/py-pisa/patches/patch-sx_pisa3_pisa__parser.py
cvs diff -r1.19 -r1.20 pkgsrc/print/py-pisa/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/py-pisa/Attic/Makefile 2017/09/30 07:52:18 1.19
+++ pkgsrc/print/py-pisa/Attic/Makefile 2018/01/08 22:11:06 1.20
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.19 2017/09/30 07:52:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2018/01/08 22:11:06 joerg Exp $
2 2
3DISTNAME= pisa-3.0.33 3DISTNAME= pisa-3.0.33
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= textproc print www python 6CATEGORIES= textproc print www python
7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pisa/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pisa/}
8 8
9OWNER= joerg@NetBSD.org 9OWNER= joerg@NetBSD.org
10HOMEPAGE= https://pypi.python.org/pypi/pisa/ 10HOMEPAGE= https://pypi.python.org/pypi/pisa/
11COMMENT= HTML2pdf converter (obsolete, use print/py-weasyprint instead) 11COMMENT= HTML2pdf converter (obsolete, use print/py-weasyprint instead)
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 14DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
15DEPENDS+= ${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab 15DEPENDS+= ${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab
16DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 16DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
17 17
18PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 3.0.33 18PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 3.0.33
19 19
20# remove CRs: fixes patching on Darwin and stops pkglint from complaining 20# remove CRs: fixes patching on Darwin and stops pkglint from complaining
21pre-patch: 21pre-patch:
22.for f in css.py cssDOMElementInterface.py 22 cd ${WRKSRC} && for f in sx/*/*.py; do \
23 ${TR} -d '\r' < ${WRKSRC}/sx/w3c/${f} > ${WRKSRC}/sx/w3c/${f}.new 23 ${TR} -d '\r' < $$f > $${f}.new && ${MV} $${f}.new $$f; \
24 ${MV} ${WRKSRC}/sx/w3c/${f}.new ${WRKSRC}/sx/w3c/${f} 24 done
25.endfor 
26 25
27.include "../../lang/python/egg.mk" 26.include "../../lang/python/egg.mk"
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/print/py-pisa/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/py-pisa/Attic/distinfo 2017/06/29 20:02:02 1.9
+++ pkgsrc/print/py-pisa/Attic/distinfo 2018/01/08 22:11:06 1.10
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.9 2017/06/29 20:02:02 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2018/01/08 22:11:06 joerg Exp $
2 2
3SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209 3SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209
4RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac 4RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac
5SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975 5SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975
6Size (pisa-3.0.33.tar.gz) = 4500555 bytes 6Size (pisa-3.0.33.tar.gz) = 4500555 bytes
7SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca 7SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca
 8SHA1 (patch-sx_pisa3_pisa__context.py) = 3822f8b4e155bf6d2cbe57304d641dee459151fe
 9SHA1 (patch-sx_pisa3_pisa__parser.py) = 54a582b177ec5866ad2b3ba0db8d7a3bc9b8ad51
8SHA1 (patch-sx_pisa3_pisa__reportlab.py) = 0eb4a042b151d94ee8d3d12fc00b28fee4b31e48 10SHA1 (patch-sx_pisa3_pisa__reportlab.py) = 0eb4a042b151d94ee8d3d12fc00b28fee4b31e48
9SHA1 (patch-sx_pisa3_pisa__util.py) = 130f9ac339239b71fc6a4920c0cadcccdbc1a913 11SHA1 (patch-sx_pisa3_pisa__util.py) = 130f9ac339239b71fc6a4920c0cadcccdbc1a913
File Added: pkgsrc/print/py-pisa/patches/Attic/patch-sx_pisa3_pisa__context.py
$NetBSD: patch-sx_pisa3_pisa__context.py,v 1.1 2018/01/08 22:11:06 joerg Exp $

--- sx/pisa3/pisa_context.py.orig	2018-01-08 14:18:52.579405122 +0000
+++ sx/pisa3/pisa_context.py
@@ -40,7 +40,10 @@ from reportlab.lib.fonts import addMappi
 
 from sx.w3c import css, cssDOMElementInterface
 
-from html5lib.sanitizer import *
+try:
+    from html5lib.filters.sanitizer import *
+except ImportError:
+    from html5lib.sanitizer import *
 
 import logging
 log = logging.getLogger("ho.pisa")
File Added: pkgsrc/print/py-pisa/patches/Attic/patch-sx_pisa3_pisa__parser.py
$NetBSD: patch-sx_pisa3_pisa__parser.py,v 1.1 2018/01/08 22:11:06 joerg Exp $

--- sx/pisa3/pisa_parser.py.orig	2018-01-08 15:08:43.919276904 +0000
+++ sx/pisa3/pisa_parser.py
@@ -26,7 +26,11 @@ import os
 import os.path
 
 import html5lib
-from html5lib import treebuilders, serializer, treewalkers, inputstream
+from html5lib import treebuilders, serializer, treewalkers
+try:
+    from html5lib import inputstream
+except ImportError:
+    from html5lib import _inputstream as inputstream
 from xml.dom import Node
 import xml.dom.minidom
 
@@ -612,9 +616,8 @@ def pisaParser(src, c, default_css="", x
                  log.error("%r is not a valid encoding", encoding)
     
     document = parser.parse(
-        src,
-        encoding=encoding)
-        
+        src)
+
     if xml_output:        
         xml_output.write(document.toprettyxml(encoding="utf8"))