common: more robust undecorating

circle/common/models.py

@@ -223,10 +223,12 @@ def compute_cached(method, instance, memcached_seconds,
         instance = model.objects.get(id=id)
         instance = model.objects.get(id=id)
         try:
         try:
             method = getattr(model, method)
             method = getattr(model, method)
-            if hasattr(method, 'fget'):
-                method = method.fget
+            while hasattr(method, '_original') or hasattr(method, 'fget'):
+                try:
                     method = method._original
                     method = method._original
                 except AttributeError:
                 except AttributeError:
+                    method = method.fget
+        except AttributeError:
             logger.exception("Couldnt get original method of %s.%s",
             logger.exception("Couldnt get original method of %s.%s",
                              unicode(instance), method.__name__)
                              unicode(instance), method.__name__)
             raise
             raise