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

Timestamp:

01/13/08 01:22:35 (16 years ago)

Author:

jerome

Message:

Database backends now convert from and to unicode instead of UTF-8.
The data dumper now expects unicode datas from the database.

Files:

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

pykota/trunk/pykota/storage.py

@@ -728 +728 @@
         return gpquotas        
         
-    def databaseToUserCharset(self, text) :
-        """Converts from database format (UTF-8) to user's charset."""
-        return self.tool.UTF8ToUserCharset(text)
-        
-    def userCharsetToDatabase(self, text) :
-        """Converts from user's charset to database format (UTF-8)."""
-        return self.tool.userCharsetToUTF8(text)
-        
+    def databaseToUnicode(self, text) :
+        """Converts from database format (UTF-8) to unicode."""
+        if text is not None :
+            return text.decode("UTF-8", "replace")
+        else : 
+            return None
+        
+    def unicodeToDatabase(self, text) :
+        """Converts from unicode to database format (UTF-8)."""
+        if text is not None : 
+            return text.encode("UTF-8", "replace")
+        else :    
+            return None
+            
     def cleanDates(self, startdate, enddate) :    
         """Clean the dates to create a correct filter."""