Use qualname to avoid key collisions

Author: fbidu

dogpile/cache/util.py

@@ -1,7 +1,6 @@
 from hashlib import sha1
 
-from ..util import compat
-from ..util import langhelpers
+from ..util import compat, langhelpers
 
 
 def function_key_generator(namespace, fn, to_str=str):
@@ -24,9 +23,9 @@ def function_key_generator(namespace, fn, to_str=str):
     """
 
     if namespace is None:
-        namespace = "%s:%s" % (fn.__module__, fn.__name__)
+        namespace = "%s:%s" % (fn.__module__, fn.__qualname__)
     else:
-        namespace = "%s:%s|%s" % (fn.__module__, fn.__name__, namespace)
+        namespace = "%s:%s|%s" % (fn.__module__, fn.__qualname__, namespace)
 
     args = compat.inspect_getargspec(fn)
     has_self = args[0] and args[0][0] in ("self", "cls")

tests/cache/test_util.py

@@ -0,0 +1,28 @@
+from dogpile.cache import util
+
+
+class A:
+    @classmethod
+    def class_method(cls):
+        pass
+
+    @staticmethod
+    def static_method():
+        pass
+
+    def instance_method(self):
+        pass
+
+
+def test_function_key_generator():
+    key_generator = util.function_key_generator(None, A.class_method)
+    assert key_generator() == "tests.cache.test_util:A.class_method|"
+
+    key_generator = util.function_key_generator(None, A.static_method)
+    assert key_generator() == "tests.cache.test_util:A.static_method|"
+
+    key_generator = util.function_key_generator(None, A.instance_method)
+    assert key_generator() == "tests.cache.test_util:A.instance_method|"
+
+    key_generator = util.function_key_generator("namespace", A.class_method)
+    assert key_generator() == "tests.cache.test_util:A.class_method|namespace|"