Changeset 657 for branches

Timestamp:

04/05/13 15:39:57 (3 years ago)

Author:

mmckerns

Message:

added pop, clear, and iterator methods to db_dict

File:

• branches/decorate/memoize.py (modified) (1 diff)

branches/decorate/memoize.py

@@ -316 +316 @@
     def has_key(self, key):
         return bool(self._select_key_items(key))
-    def get(self, key, value):
+    def get(self, key, value=None):
         res = self._select_key_items(key)
-        rv = value
-        if res:  rv = res[-1][-1]
-        return rv
+        if res: value = res[-1][-1]
+        return value
+    def pop(self, key, *value):
+        L = len(value)
+        if L > 1:
+            raise TypeError, "pop expected at most 2 arguments, got %s" % L+1
+        res = self._select_key_items(key)
+        if res:
+            _value = res[-1][-1]
+        else:
+            if not L: raise KeyError, key
+            _value = value[0]
+        sql = "delete from %s where argstr = ?" % self._table
+        self._curs.execute(sql, (key,))
+        self._conn.commit()
+        return _value 
+    def clear(self):
+        [self.pop(k) for k in self.keys()] # better delete table, add empty ?
+        return
+    def update(self, adict, **kwds):
+        _dict = adict.copy()
+        _dict.update(**kwds)
+        [self.__setitem__(k,v) for (k,v) in _dict.items()]
+        return
+    def iteritems(self):
+        return ((k,self.__getitem__(k)) for k in self.__iter__())
     def items(self):
-        return self.__asdict__().items()
+       #return self.__asdict__().items()
+        return list(self.iteritems())
     def keys(self):
-        return self.__asdict__().keys()
+       #return self.__asdict__().keys()
+        return list(self.__iter__())
+    def itervalues(self):
+        return (self.__getitem__(k) for k in self.__iter__())
     def values(self):
-        return self.__asdict__().values()
+       #return self.__asdict__().values()
+        return list(self.itervalues())
     def __repr__(self):
-        return "memo(%s)" % self.__asdict__()
+        return "%s(%s)" % (self._table, self.__asdict__())
+    def __iter__(self):
+        sql = "select argstr from %s" % self._table
+        return (k[-1] for k in set(self._curs.execute(sql)))
+    iterkeys = __iter__
     def _select_key_items(self, key):
         '''Return a tuple of (key, value) pairs that match the specified key.
         '''
         sql = "select * from %s where argstr = ?" % self._table
-        res = tuple(self._curs.execute(sql, (key,)))
-        return res
+        return tuple(self._curs.execute(sql, (key,)))
     pass