Changeset 7511

Timestamp:

25 Jan 2012, 14:25:17 (13 years ago)

Author:

uli

Message:

Make formatted_text a bit smarter regarding to encodings. It now
returns a unicode string instead of raw strings. I stumbled
over some broken PDF generations when names of students contained
umlauts. Hope, this will fix this without breaking other things. At
least reportlab is able to cope with unicode strings.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/utils.py (modified) (6 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/utils.py

@@ -55 +55 @@
     return tag1 + '%s:</font>'
 
-def formatted_text(color=FONT_COLOR, size=FONT_SIZE):
-    tag1 ='<font color=%s size=%d>' % (color, size)
-    return tag1 + '%s</font>'
+def formatted_text(text, color=FONT_COLOR, size=FONT_SIZE):
+    """Turn `text`, `color` and `size` into an HTML snippet.
+
+    The snippet is suitable for use with reportlab and generating PDFs.
+    Wraps the `text` into a ``<font>`` tag with passed attributes.
+
+    Also non-strings are converted. Raw strings are expected to be
+    utf-8 encoded (usually the case for widgets etc.).
+
+    The returned snippet is unicode type.
+    """
+    if not isinstance(text, unicode):
+        if isinstance(text, basestring):
+            text = text.decode('utf-8')
+        else:
+            text = unicode(text)
+    tag1 = u'<font color="%s" size="%d">' % (color, size)
+    return tag1 + u'%s</font>' % text
 
 def generate_student_id(students,letter):
@@ -104 +119 @@
         f_label = formatted_label() % widget.label.strip()
         f_label = Paragraph(f_label, style["Normal"])
-        f_text = formatted_text() % widget()
+        f_text = formatted_text(widget())
         f_text = Paragraph(f_text, style["Normal"])
         data_right.append([f_label,f_text])
@@ -120 +135 @@
     style = getSampleStyleSheet()
     for element in tableheader:
-        field = formatted_text(color='white') % element[0]
+        field = formatted_text(element[0], color='white')
         field = Paragraph(field, style["Normal"])
         line.append(field)
@@ -127 +142 @@
         line = []
         for element in tableheader:
-              field = formatted_text() % str(getattr(ticket,element[1],u' '))
+              field = formatted_text(getattr(ticket,element[1],u' '))
               field = Paragraph(field, style["Normal"])
               line.append(field)
@@ -261 +276 @@
             f_label = formatted_label() % widget.label.strip()
             f_label = Paragraph(f_label, style["Normal"])
-            f_text = formatted_text() % str(widget())
+            f_text = formatted_text(widget())
             f_text = Paragraph(f_text, style["Normal"])
             data.append([f_label,f_text])
@@ -291 +306 @@
                     data.append([f_label,doc_img])
                 else:
-                    f_text = formatted_text() % viewlet.title
+                    f_text = formatted_text(viewlet.title)
                     f_text = Paragraph(f_text, style["Normal"])
                     data.append([f_label,f_text])