-

cool-RR · cool-RR · commit def0485356f1 · 2012-05-30T21:20:56.000+03:00
diff --git a/python_toolbox/caching/cache.py b/python_toolbox/caching/cache.py
@@ -91,9 +91,15 @@ def cached(function, *args, **kwargs):
         
         result = decorator_tools.decorator(cached, function)
         
-        def cache_clear():
-            '''Clear the cache, deleting all saved results.'''
-            cached._cache.clear()    
+        def cache_clear(key=None):
+            if key is None:
+                cached._cache.clear()
+            else:
+                try:
+                    del cached._cache[key]
+                except KeyError:
+                    pass
+                
         result.cache_clear = cache_clear
         
         result.is_cached = True
diff --git a/python_toolbox/dict_tools.py b/python_toolbox/dict_tools.py
@@ -4,7 +4,7 @@
 '''Defines several functions that may be useful when working with dicts.'''
 
 
-def filter_items(d, condition):
+def filter_items(d, condition, force_dict_type=None):
     '''
     Get new dict with items from `d` that satisfy the `condition` functions.
     
@@ -16,7 +16,10 @@ def filter_items(d, condition):
     '''
     # todo future: possibly shallow-copy `d` to allow for dict classes that
     # have more state, (like default factory.)
-    dict_type = type(d) if (type(d).__name__ != 'dictproxy') else dict
+    if force_dict_type is not None:
+        dict_type = force_dict_type
+    else:
+        dict_type = type(d) if (type(d).__name__ != 'dictproxy') else dict
     return dict_type(
         (key, value) for (key, value) in d.iteritems() if condition(key, value)
     )
