Changeset 662 for branches

Timestamp:

05/25/13 16:19:21 (3 years ago)

Author:

mmckerns

Message:

fixed import of inf_cache, already merged into cache;
added ability for keymap to store args, kwds either flat or (args, kwds)

Location:

branches/decorate

Files:

• cache.py (modified) (1 diff)
• cache_helper.py (modified) (2 diffs)
• memoize.py (modified) (1 diff)

branches/decorate/cache.py

@@ -9 +9 @@
 from threading import RLock
 from cache_helper import _CacheInfo, Counter, hashmap as _keymap
-from INF_cache import inf_cache
-from NO_cache import no_cache
 
 

branches/decorate/cache_helper.py

@@ -12 +12 @@
            typed = False,
            kwd_mark = (object(),), #XXX: 'nicer' kwd_mark = ("",) ?  None ?
+           flat = True, #XXX: if not flat, then key = (args, tuple)
            fasttypes = set((int, str, frozenset, type(None))),
            sorted=sorted, tuple=tuple, type=type, len=len):
     'Make a cache key from optionally typed positional and keyword arguments'
+    if not flat:
+        key = (args, kwds) #XXX: pickles larger, but is simpler to unpack
+        if typed:
+            sorted_items = sorted(kwds.items())
+            key += (tuple(type(v) for v in args), \
+                    tuple(type(v) for k, v in sorted_items))
+        return key
     key = args
     if kwds:
@@ -21 +29 @@
         for item in sorted_items:
             key += item
-    if typed:
-        key += tuple(type(v) for v in args)
+    if typed: #XXX: 'kwd_mark' between each of the 4 parts, so easy to split
+        key += kwd_mark + tuple(type(v) for v in args)
         if kwds:
-            key += tuple(type(v) for k, v in sorted_items)
+            key += kwd_mark + tuple(type(v) for k, v in sorted_items)
     elif len(key) == 1 and type(key[0]) in fasttypes:
         return key[0]

branches/decorate/memoize.py

@@ -353 +353 @@
     if memo is None: memo = archive_dict()
     elif type(memo) is dict: memo = archive_dict(memo)
-    # does archive make sense with databas, file, ?... (requires more thought)
+    # does archive make sense with database, file, ?... (requires more thought)
 
     if deep: rounded = deep_round