libervia-pubsub: idavoll/memory_storage.py comparison

Don't return anything when removing items, and raise exception when an item is not found. Return items for get_items() in unicode string.

comparison

equal deleted inserted replaced

-:0d7b95fb2549
+:ffc3c706b0fb
 def remove_items(self, item_ids):
 deleted = []
 for item_id in item_ids:
-try:
+if not self._items.has_key(item_id):
-item = self._items[item_id]
+return defer.fail(storage.ItemNotFound())
-self._itemlist.remove(item)
-del self._items[item_id]
+for item_id in item_ids:
-deleted.append(item_id)
+item = self._items[item_id]
-except KeyError:
+self._itemlist.remove(item)
-pass
+del self._items[item_id]
-return defer.succeed(deleted)
+return defer.succeed(None)
 def get_items(self, max_items=None):
 if max_items:
 list = self._itemlist[-max_items:]
 else:
 list = self._itemlist
-return defer.succeed([item[0] for item in list])
+return defer.succeed([unicode(item[0], 'utf-8') for item in list])
 def get_items_by_id(self, item_ids):
 items = []
 for item_id in item_ids:
 try:
 item = self._items[item_id]
 except KeyError:
 pass
 else:
-items.append(item[0])
+items.append(unicode(item[0], 'utf-8'))
 return defer.succeed(items)
 def purge(self):
 self._items = {}
 self._itemlist = []

Mercurial > libervia-pubsub