get_name() changes to handle class property case

pytool/json.py

@@ -10,7 +10,11 @@
 """
 from datetime import datetime
 
-import simplejson as json
+try:
+    import simplejson as json
+except:
+    import json
+
 # Conditionally handle bson import so we don't have to depend on pymongo
 try:
     import bson

pytool/lang.py

@@ -31,10 +31,12 @@ def get_name(frame):
             maybe_cls = frame.f_locals[varname]
 
             # Get the actual method, if it exists on the class
-            maybe_func = getattr(maybe_cls, frame.f_code.co_name)
-
+            if isinstance(maybe_cls, type):
+                maybe_func = maybe_cls.__dict__[frame.f_code.co_name]
+            else:
+                maybe_func = maybe_cls.__class__.__dict__[frame.f_code.co_name]
             # If we have self, or a classmethod, we need the class name
-            if (varname == 'self' or maybe_func.im_self == maybe_cls):
+            if (varname in ('self', 'cls') or maybe_func.im_self == maybe_cls):
                 cls_name = (getattr(maybe_cls, '__name__', None)
                         or getattr(getattr(maybe_cls, '__class__', None),
                             '__name__', None))
@@ -236,7 +238,7 @@ class UNSET(object):
             >>> # Is good for checking default values
             >>> if {}.get('example', UNSET) is UNSET:
             ...     print "Key is missing."
-            ...     
+            ...
             Key is missing.
             >>> # Has no length
             >>> len(UNSET)
@@ -285,7 +287,7 @@ class Namespace(object):
         >>> # Namespaces are iterable
         >>> for name, value in myns:
         ...     print name, value
-        ...     
+        ...
         hello world
         example.value True
         >>> # Namespaces that are empty evaluate as False
@@ -300,7 +302,7 @@ class Namespace(object):
         >>> class MyDescriptor(object):
         ...     def __get__(self, instance, owner):
         ...         return 'Hello World'
-        ...     
+        ...
         >>> myns.descriptor = MyDescriptor()
         >>> myns.descriptor
         'Hello World'

test/test_lang.py

@@ -35,6 +35,29 @@ def test(self):
     Test().test()
 
 
+def test_get_name_class_method():
+    class Test(object):
+        @classmethod
+        def test(cls):
+            frame = inspect.currentframe()
+            eq_(pytool.lang.get_name(frame),
+                    'test.test_lang.Test.test')
+            del frame
+
+    Test.test()
+
+
+def test_get_name_class_property():
+    class Test(object):
+        @property
+        def test(self):
+            frame = inspect.currentframe()
+            this_name = pytool.lang.get_name(frame)
+            del frame
+            return this_name
+    eq_(Test().test, 'test.test_lang.Test.test')
+
+
 def test_classproperty():
     class Test(object):
         value = 'Test'