Ticket #16307: 16307_test_callable_variable_attribute_parsing.diff

django/template/base.py

@@ -690 +690 @@
                                 TypeError,  # unsubscriptable object
                                 ):
                             raise VariableDoesNotExist("Failed lookup for key [%s] in %r", (bit, current)) # missing attribute
-                if callable(current):
+                if callable(current) and not isinstance(current, type):
                     if getattr(current, 'alters_data', False):
                         current = settings.TEMPLATE_STRING_IF_INVALID
                     else:

tests/regressiontests/templates/parser.py

@@ -81 +81 @@
         self.assertRaises(TemplateSyntaxError,
             Variable, "article._hidden"
         )
+
+    def test_callable_variable_attribute_parsing(self):
+        # Test for ticket https://code.djangoproject.com/ticket/16307
+
+        # Classes shouldn't be treated as callables.
+        # Using a required argument to force a failure when calling.
+
+        # Class methods and static methods should get called normally.
+        class SomeClass(object):
+            verbose_name = "Some Class"
+
+            def __init__(self, required_arg):
+                pass
+
+            @classmethod
+            def class_method(cls):
+                return 'class method'
+
+            @staticmethod
+            def static_method():
+                return 'static method'
+
+        # A simple function should get called normally
+        def some_function():
+            return {"verbose_name": "some function"}
+
+        c = {"some_class": SomeClass, "some_function": some_function}
+
+        self.assertEqual(Variable("some_class.verbose_name").resolve(c), "Some Class")
+        self.assertEqual(Variable("some_class.class_method").resolve(c), "class method")
+        self.assertEqual(Variable("some_class.static_method").resolve(c), "static method")
+        self.assertEqual(Variable("some_function.verbose_name").resolve(c), "some function")
+