Ticket #2082: more_robust_resolve_variable_in_template.diff

django/template/__init__.py

@@ -59 +59 @@
 from django.utils.functional import curry
 from django.conf import settings
 from django.template.context import Context, RequestContext, ContextPopException
+from django.core.exceptions import ObjectDoesNotExist
 
 __all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
 
@@ -626 +627 @@
         current = context
         bits = path.split(VARIABLE_ATTRIBUTE_SEPARATOR)
         while bits:
-            try: # dictionary lookup
-                current = current[bits[0]]
-            except (TypeError, AttributeError, KeyError):
-                try: # attribute lookup
-                    current = getattr(current, bits[0])
-                    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(bits[0])]
-                    except (IndexError, ValueError, KeyError):
-                        raise VariableDoesNotExist, "Failed lookup for key [%s] in %r" % (bits[0], current) # missing attribute
-                except Exception, e:
-                    if getattr(e, 'silent_variable_failure', False):
+            bit = bits.pop(0)
+            if 'has_key' in dir(current) and current.has_key(bit): # dictionary lookup
+                current = current[bit]
+            elif bit in dir(current): # attribute lookup
+                current = getattr(current, bit)
+                if callable(current): # method call
+                    if getattr(current, 'alters_data', False):
                         current = settings.TEMPLATE_STRING_IF_INVALID
                     else:
-                        raise        
-            del bits[0]
+                        try: 
+                            current = current()
+                        except TypeError: # arguments *were* required
+                            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
+            elif type(current) == list or type(current) == tuple and bit.isdigit() and int(bit) < len(current):
+                # list lookup
+                current = current[int(bit)]
+            else:
+                if ObjectDoesNotExist.silent_variable_failure:
+                    current = settings.TEMPLATE_STRING_IF_INVALID
+                else:
+                    raise VariableDoesNotExist, "Failed lookup for key [%s] in %r" % (bit, current) # missing attribute
     return current
 
 class Node: