-

Ram Rachum · Ram Rachum · commit a1eb1ab9d30a · 2010-09-12T20:30:30.000+02:00
diff --git a/garlicsim/garlicsim/general_misc/sleek_refs.py b/garlicsim/garlicsim/general_misc/sleek_refs.py
@@ -6,13 +6,16 @@
 
 __all__ = ['CuteSleekValueDictionary', 'SleekRef']
 
+class Ref(weakref.ref):
+    pass
+
 class SleekRef(object):
     def __init__(self, thing, callback=None):
         self.callback = callback
         if callback and not callable(callback):
             raise Exception('%s is not a callable object.' % callback)
         try:
-            self.ref = weakref.ref(thing, callback)
+            self.ref = Ref(thing, callback)
         except TypeError:
             self.ref = None
             self.thing = thing
@@ -200,15 +203,14 @@ class KeyedSleekRef(SleekRef):
 
     """
 
-    __slots__ = "key",
-
     def __new__(type, ob, callback, key):
-        self = SleekRef.__new__(type, ob, callback)
-        self.key = key
+        self = SleekRef.__new__(type)
         return self
 
     def __init__(self, ob, callback, key):
         super(KeyedSleekRef, self).__init__(ob, callback)
+        if self.ref:
+            self.ref.key = key
 
 
     
diff --git a/garlicsim/tests/general_misc/sleek_refs.py b/garlicsim/tests/general_misc/sleek_refs.py
@@ -19,11 +19,11 @@ def s():
 
     
 def counter(_=None):
-        if not hasattr(counter, 'count'):
-            counter.count = 0
-        result = counter.count
-        counter.count += 1
-        return result
+    if not hasattr(counter, 'count'):
+        counter.count = 0
+    result = counter.count
+    counter.count += 1
+    return result
 
     
 def test_sleek_ref():
@@ -69,13 +69,31 @@ def test_cute_sleek_value_dictionary():
     unvolatile_things = [A.s, __builtins__, list, type,  list.append, str.join,
                          sum]
     
+    # Using len(csvd) as our key; Just to guarantee we're not running over an
+    # existing key.
+        
     while volatile_things:
         volatile_thing = volatile_things.pop()
         csvd = CuteSleekValueDictionary(counter)
-        # Using len(csvd) as our key; Just to guarantee we're not running over
-        # an existing key.
-        csvd[len(csvd)] = volatile_thing
+        if _is_weakreffable(volatile_thing):
+            csvd[len(csvd)] = volatile_thing
+            count = counter()
+            del volatile_thing
+            gc.collect()
+            assert counter() == count + 2
+        else:
+            csvd[len(csvd)] = volatile_thing
+            count = counter()
+            del volatile_thing
+            gc.collect()
+            assert counter() == count + 1
+            
+    while unvolatile_things:
+        unvolatile_thing = unvolatile_things.pop()
+        csvd = CuteSleekValueDictionary(counter)
+        
+        csvd[len(csvd)] = unvolatile_thing
         count = counter()
-        del volatile_thing
+        del unvolatile_thing
         gc.collect()
-        assert counter() == count + 2
+        assert counter() == count + 1
