Changeset 2804 for pykota/trunk/pykota/storage.py

Timestamp:

03/25/06 22:22:07 (18 years ago)

Author:

jerome

Message:

Ensures that all texts sent by pknotify to a remote pykoticon server
are UTF-8 encoded.

Files:

• pykota/trunk/pykota/storage.py (modified) (1 diff)

pykota/trunk/pykota/storage.py

@@ -646 +646 @@
     def databaseToUserCharset(self, text) :
         """Converts from database format (UTF-8) to user's charset."""
-        if text is not None :
-            try :
-                return unicode(text, "UTF-8").encode(self.tool.getCharset()) 
-            except UnicodeError :    
-                try :
-                    # Incorrect locale settings ?
-                    return unicode(text, "UTF-8").encode("ISO-8859-15") 
-                except UnicodeError :    
-                    pass
-        return text
+        return self.tool.UTF8ToUserCharset(text)
         
     def userCharsetToDatabase(self, text) :
         """Converts from user's charset to database format (UTF-8)."""
-        if text is not None :
-            try :
-                return unicode(text, self.tool.getCharset()).encode("UTF-8") 
-            except UnicodeError :    
-                try :
-                    # Incorrect locale settings ?
-                    return unicode(text, "ISO-8859-15").encode("UTF-8") 
-                except UnicodeError :    
-                    pass
-        return text
+        return self.tool.userCharsetToUTF8(text)
         
     def cleanDates(self, startdate, enddate) :