From 5a6915e0d97abd9dd0df52085a9a68b893813de1 Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Mar 19 2019 18:09:48 +0000 Subject: Events should use public api --- diff --git a/updateinfo/collection/store/events.py b/updateinfo/collection/store/events.py index 7777117..687ce30 100644 --- a/updateinfo/collection/store/events.py +++ b/updateinfo/collection/store/events.py @@ -48,22 +48,6 @@ class CollectionStoreEvents(object): '''setup''' pass - def __delitem__(self, key): - ''' Used for: removing like a dict ''' - del self._collist[key] - - def __setitem__(self, key, value): - ''' - For simply adding a collection (no merge) - ''' - if not isinstance(value, type(self.Collection())): - raise TypeError('I can only add ' + str(type(self.Collection())) + ' type objects, not ' + str(type(value))) - - if key != value.short_name: - raise ValueError('Incorrect shortname, should have been "' + value.short_name + '"') - - self._collist[key] = value - def add(self, coll, merge=True): '''add a collection to the list''' if xmletree.iselement(coll): @@ -100,6 +84,7 @@ class CollectionStoreEvents(object): def create(self, release_name=None, short_name=None, merge=True): '''Make a new collection and add it to the store''' + logging.debug("Trying to create collection: short:%s, release:%s merge:%s", short_name, release_name, merge) coll = self.Collection(release_name=release_name, short_name=short_name) return self.add(coll, merge) @@ -123,6 +108,7 @@ class CollectionStoreEvents(object): if name == None: raise ValueError('Pass either short_name or the coll object') + logging.debug("Trying to delete collection:%s", obj) del self[name] if name not in self: diff --git a/updateinfo/collection/store/models.py b/updateinfo/collection/store/models.py index cf4ce50..61308bc 100644 --- a/updateinfo/collection/store/models.py +++ b/updateinfo/collection/store/models.py @@ -100,6 +100,22 @@ class CollectionStoreModel(object): ''' Used for: treating like a dict ''' return self._collist[key] + def __delitem__(self, key): + ''' Used for: removing like a dict ''' + del self._collist[key] + + def __setitem__(self, key, value): + ''' + For simply adding a collection (no merge) + ''' + if not isinstance(value, type(self.Collection())): + raise TypeError('I can only add ' + str(type(self.Collection())) + ' type objects, not ' + str(type(value))) + + if key != value.short_name: + raise ValueError('Incorrect shortname, should have been "' + value.short_name + '"') + + self._collist[key] = value + def __contains__(self, key): ''' Used for: x in object