Move ustr() to xml utilities module

1 files changed, 18 insertions, 0 deletions

diff --git a/pykolab/xml/utils.py b/pykolab/xml/utils.py
index 261e33c..9d80f9c 100644
--- a/pykolab/xml/utils.py
+++ b/pykolab/xml/utils.py
@@ -127,6 +127,24 @@ def dates_equal(a, b):
     return type(a) == type(b) and a.strftime(date_format) == b.strftime(date_format)
 
 
+def ustr(s):
+    """
+        Force the given (unicode) string into UTF-8 encoding
+    """
+    if not isinstance(s, unicode):
+        for cs in ['utf-8','latin-1']:
+            try:
+                s = unicode(s, cs)
+                break
+            except:
+                pass
+
+    if isinstance(s, unicode):
+        return s.encode('utf-8')
+
+    return s
+
+
 property_labels = {
     "name":        N_("Name"),
     "summary":     N_("Summary"),