diff idavoll/memory_storage.py @ 139:8f6956b9a688

Follow API change in Twisted Xish, while still being compatible with Twisted Xish 0.1.0.
author Ralph Meijer <ralphm@ik.nu>
date Wed, 27 Apr 2005 19:45:41 +0000
parents ffc3c706b0fb
children 812300cdbc22
line wrap: on
line diff
--- a/idavoll/memory_storage.py	Mon Apr 25 13:02:37 2005 +0000
+++ b/idavoll/memory_storage.py	Wed Apr 27 19:45:41 2005 +0000
@@ -149,7 +149,10 @@
     def store_items(self, items, publisher):
         for data in items:
             id = data["id"]
-            item = (data.toXml(), publisher)
+            data = data.toXml()
+            if isinstance(data, str):
+                data = data.decode('utf-8')
+            item = (data, publisher)
             if id in self._items:
                 self._itemlist.remove(self._items[id])
             self._items[id] = item
@@ -176,7 +179,7 @@
             list = self._itemlist[-max_items:]
         else:
             list = self._itemlist
-        return defer.succeed([unicode(item[0], 'utf-8') for item in list])
+        return defer.succeed([item[0] for item in list])
     
     def get_items_by_id(self, item_ids):
         items = []
@@ -186,7 +189,7 @@
             except KeyError:
                 pass
             else:
-                items.append(unicode(item[0], 'utf-8'))
+                items.append(item[0])
         return defer.succeed(items)
 
     def purge(self):