Changeset 25:35f67e320b88

Timestamp:

07/23/08 12:19:49 (5 years ago)

Author:

Nicolas Evrard <nicoe@…>

Branch:

default

Message:

- Support the case where the image: expression contains a quote or guillemet

Location:

relatorio

Files:

• templates/odt.py (modified) (2 diffs)
• tests/egg.jpg (added)
• tests/test.odt (modified) (previous)
• tests/test_odt.py (modified) (3 diffs)

relatorio/templates/odt.py

@@ -19 +19 @@
 ###############################################################################
 
-__revision__ = "$Id: odt.py 25 2008-07-23 10:38:25Z nicoe $"
+__revision__ = "$Id: odt.py 26 2008-07-23 12:19:49Z nicoe $"
 __metaclass__ = type
 
@@ -177 +177 @@
             d_name = draw.attrib['{%s}name' % self.namespaces['draw']]
             if d_name.startswith('image: '):
-                attr_expr = "make_href(%s, '%s')" % (d_name[7:], d_name[7:])
+                attr_expr = "make_href(%s, %r)" % (d_name[7:], d_name[7:])
                 attributes = {}
                 attributes['{%s}attrs' % self.namespaces['py']] = attr_expr

relatorio/tests/test_odt.py

@@ -20 +20 @@
 ###############################################################################
 
-__revision__ = "$Id: test_odt.py 25 2008-07-23 10:38:25Z nicoe $"
+__revision__ = "$Id: test_odt.py 26 2008-07-23 12:19:49Z nicoe $"
 
 import os
@@ -65 +65 @@
                                 (file(os.path.join(thisdir, 'two.png')),
                                  'image/png')],
+                     'oeuf': file(os.path.join(thisdir, 'egg.jpg')),
                      'footer': u'We sell stuffs'}
 
@@ -125 +126 @@
         root = tree.getroot()
         images = root.xpath('//draw:frame', namespaces=self.oot.namespaces)
-        eq_(len(images), 2)
+        eq_(len(images), 3)
         eq_(images[0].attrib['{%s}name' % self.oot.namespaces['draw']],
+            "image: (oeuf, 'image/png')")
+        eq_(images[1].attrib['{%s}name' % self.oot.namespaces['draw']],
             'image: img')
-        eq_(images[0].attrib['{%s}width' % self.oot.namespaces['svg']],
-            '1.732cm')
-        eq_(images[0].attrib['{%s}height' % self.oot.namespaces['svg']],
-            '1.513cm')
         eq_(images[1].attrib['{%s}width' % self.oot.namespaces['svg']],
             '1.732cm')
         eq_(images[1].attrib['{%s}height' % self.oot.namespaces['svg']],
             '1.513cm')
+        eq_(images[2].attrib['{%s}width' % self.oot.namespaces['svg']],
+            '1.732cm')
+        eq_(images[2].attrib['{%s}height' % self.oot.namespaces['svg']],
+            '1.513cm')