Changeset 628:447251b5af65 in documentViewer

Timestamp:

Feb 11, 2015, 4:18:23 PM (10 years ago)

Author:

casties

Branch:

default

Message:

make sure utf8ify and unicodify output text.

File:

• SrvTxtUtils.py (modified) (3 diffs)

SrvTxtUtils.py

@@ -23 +23 @@
 import xml.etree.ElementTree as ET
 
-srvTxtUtilsVersion = "1.13"
+srvTxtUtilsVersion = "1.13.1"
 
 map_months = {'en': [u"",
@@ -95 +95 @@
         except:
             return s.decode('latin-1')
+    elif isinstance(s, unicode):
+        return s
     else:
-        return s
+        return unicode(s)
 
 def utf8ify(s):
@@ -103 +105 @@
     if not s:
         return ""
-    if isinstance(s, str):
+    if isinstance(s, unicode):
+        return s.encode('utf-8')
+    elif isinstance(s, str):
         return s
     else:
-        return s.encode('utf-8')
+        return str(s)