Ticket #7153: template_callable.diff

django/template/__init__.py

@@ -686 +686 @@
             except (TypeError, AttributeError, KeyError):
                 try: # attribute lookup
                     current = getattr(current, bit)
-                    if callable(current):
-                        if getattr(current, 'alters_data', False):
-                            current = settings.TEMPLATE_STRING_IF_INVALID
-                        else:
-                            try: # method call (assuming no args required)
-                                current = current()
-                            except TypeError: # arguments *were* required
-                                # GOTCHA: This will also catch any TypeError
-                                # raised in the function itself.
-                                current = settings.TEMPLATE_STRING_IF_INVALID # invalid method call
-                            except Exception, e:
-                                if getattr(e, 'silent_variable_failure', False):
-                                    current = settings.TEMPLATE_STRING_IF_INVALID
-                                else:
-                                    raise
                 except (TypeError, AttributeError):
                     try: # list-index lookup
                         current = current[int(bit)]
@@ -715 +700 @@
                         current = settings.TEMPLATE_STRING_IF_INVALID
                     else:
                         raise
+            
+            if callable(current):
+                if getattr(current, 'alters_data', False):
+                    current = settings.TEMPLATE_STRING_IF_INVALID
+                else:
+                    try: # method call (assuming no args required)
+                        current = current()
+                    except TypeError: # arguments *were* required
+                        # GOTCHA: This will also catch any TypeError
+                        # raised in the function itself.
+                        current = settings.TEMPLATE_STRING_IF_INVALID # invalid method call
+                    except Exception, e:
+                        if getattr(e, 'silent_variable_failure', False):
+                            current = settings.TEMPLATE_STRING_IF_INVALID
+                        else:
+                            raise
 
         return current