Changeset 5876 for main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py

Timestamp:

18 Mar 2011, 17:52:21 (14 years ago)

Author:

uli

Message:

Fix ReST2HTML() to always deliver unicode strings. Otherwise we could
get EnodingErrors? when using this function with HTML forms.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py (modified) (3 diffs)

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

@@ -241 +241 @@
     Returns a tuple ``(<HTML_CODE>, <WARNINGS>)``, both being
     strings. Where ``<HTML_CODE>`` is the HTML code generated from the
-    source string, ``<WARNINGS>`` is a string containing any warning
-    messages or ``None``.
+    source string (in unicode), ``<WARNINGS>`` is a string containing
+    any warning messages or ``None``.
     
     Regular multi-line ReStructuredText strings will be returned as
@@ -322 +322 @@
     if warning_msgs == '':
         warning_msgs = None
-    return getInnerHTMLPart(fulldoc).strip(), warning_msgs
+    result = getInnerHTMLPart(fulldoc).strip()
+    if not isinstance(result, unicode):
+        result = result.decode('utf-8')
+    return result, warning_msgs
 
 def ReST2HTML(source_string):
@@ -331 +334 @@
     warnings.
 
+    The returned string will be unicode.
+    
     A regular document will be rendered like this: