Changeset 124:7cac12720969

Timestamp:

03/24/09 10:45:58 (16 months ago)

Author:

Ga?tan de Menten <ged@…>

Parents:

122:df824ebd5734 (diff), 123:dfee8d6b2bca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Children:

125:a05226654d45, 127:5a66f1d61a0c

Branch:

default

Message:

Backed out e103a74a8d84. We still want python2.4 compatibility for now.

Location:

relatorio/templates/opendocument.py

Files:

• . (modified) (1 diff)
• . (modified) (1 diff)

relatorio/templates/opendocument.py

@@ -333 +333 @@
 
                 # - we create a <py:xxx> node
-                attribs = {attr: a_val} if attr is not None else {}
+                if attr is not None:
+                    attribs = {attr: a_val}
+                else:
+                    attribs = {}
                 genshi_node = EtreeElement('{%s}%s' % (py_namespace,
                                                        directive),

relatorio/templates/opendocument.py

@@ -127 +127 @@
     """
     old_parent = first.getparent()
+
+    # Any text after the opening tag (and not within a tag) need to be handled
+    # explicitly. For example in <if>xxx<span>yyy</span>zzz</if>, zzz is
+    # copied along the span tag, but not xxx, which corresponds to the tail
+    # attribute of the opening tag.
+    if first.tail:
+        new_parent.text = first.tail
     for node in first.itersiblings():
         if node is last: