Ticket #5048: ticket5048.diff

django/template/__init__.py

@@ -678 +678 @@
                         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 TypeError:
+                                from sys import exc_info
+                                from traceback import extract_tb
+                                exc = exc_info()
+                                if len(extract_tb(exc[-1], 2)) == 1:
+                                     # invalid method call, args *were* required
+                                    current = settings.TEMPLATE_STRING_IF_INVALID
+                                else:
+                                    # TypeError was raised from within the function itself
+                                    raise
                             except Exception, e:
                                 if getattr(e, 'silent_variable_failure', False):
                                     current = settings.TEMPLATE_STRING_IF_INVALID
                                 else:
                                     raise
-                except (TypeError, AttributeError):
+                except AttributeError:
                     try: # list-index lookup
                         current = current[int(bits[0])]
                     except (IndexError, # list index out of range

tests/regressiontests/templates/tests.py

@@ -68 +68 @@
 
     def method4(self):
         raise SomeOtherException
+    
+    def method5(self):
+        raise TypeError
 
 class OtherClass:
     def method(self):
@@ -189 +192 @@
             # Embedded newlines make it not-a-tag.
             'basic-syntax24': ("{{ moo\n }}", {}, "{{ moo\n }}"),
 
+            # Allow TypeError exceptions to propagate
+            'basic-syntax25': ("{{ var.method5 }}", {"var": SomeClass()}, TypeError),
+
             # List-index syntax allows a template to access a certain item of a subscriptable object.
             'list-index01': ("{{ var.1 }}", {"var": ["first item", "second item"]}, "second item"),