Commit 2403f581 authored by Karen Tracey's avatar Karen Tracey
Browse files

Fixed #12554: Silence exceptions that have specified... 

Fixed #12554: Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 10884ec2

tests/regressiontests/templates/tests.py

+9 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ class OtherClass: 
    def method(self):

        return "OtherClass.method"



class SilentGetItemClass(object):

    def __getitem__(self, key):

        raise SomeException



class UTF8Class:

    "Class whose __str__ returns non-ASCII data"

    def __str__(self):
@@ -465,6 +469,11 @@ class Templates(unittest.TestCase): 
            'basic-syntax26': (r'{{ "\"fred\"" }}', {}, "\"fred\""),

            'basic-syntax27': (r'{{ _("\"fred\"") }}', {}, "\"fred\""),



            # regression test for ticket #12554

            # make sure a silent_variable_failure Exception is supressed

            # on dictionary lookup

            'basic-syntax28': ("{{ a.b }}", {'a': SilentGetItemClass()}, ('', 'INVALID')),



            # 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"),

django/template/__init__.py

+5 −5

File changed.

Contains only whitespace changes.