Merge pull request #114 from zopefoundation/lregebro-use-svglib

Use an external svg2rml converter instead of maintaining our own

setup.py

@@ -76,6 +76,7 @@ def read(*rnames):
         'pikepdf>=3.0',
         'reportlab>=3.5.0',
         'setuptools',
+        'svglib',
         'zope.interface',
         'zope.schema',
     ],

src/z3c/rml/attr.py

@@ -500,15 +500,20 @@ def _load_svg(self, value):
         from xml.etree import cElementTree
 
         from reportlab.graphics import renderPM
-
-        from z3c.rml.svg2rlg import Renderer
+        from svglib.svglib import SvgRenderer
 
         fileObj = super().fromUnicode(value)
         svg = fileObj.getvalue()
         if svg[:2] == b'\037\213':
-            svg = GzipFile(fileobj=fileObj).read()
-        svg = cElementTree.fromstring(svg)
-        svg = Renderer(value).render(svg)
+            fileObj = GzipFile(fileobj=fileObj)
+        parser = etree.XMLParser(
+            remove_comments=True,
+            recover=True,
+            resolve_entities=False)
+        svg = cElementTree.parse(fileObj, parser=parser).getroot()
+
+        renderer = SvgRenderer(value)
+        svg = renderer.render(svg)
 
         if preserve:
             if width is not None or height is not None:

src/z3c/rml/list.py

@@ -81,10 +81,13 @@ class OrderedListItem(ListItem):
 class IUnorderedListItem(IListItem):
     """An ordered list item."""
 
-    value = attr.Choice(
+    value = attr.Combination(
         title='Bullet Value',
         description='The type of bullet character.',
-        choices=interfaces.UNORDERED_BULLET_VALUES,
+        value_types=(
+            attr.Choice(choices=interfaces.UNORDERED_BULLET_VALUES),
+            attr.Text(max_length=1)
+        ),
         required=False)