Commit f48cf954 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

[1.1.X] Fixed #12070. Fixed a case where var._whatever wasn't raising a... 

[1.1.X] Fixed #12070. Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. Backport of r12539 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ae01b0c5

django/template/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -518,8 +518,6 @@ class FilterExpression(object): 
                        var_obj = None

                elif var is None:

                    raise TemplateSyntaxError("Could not find variable at start of %s." % token)

                elif var.find(VARIABLE_ATTRIBUTE_SEPARATOR + '_') > -1 or var[0] == '_':

                    raise TemplateSyntaxError("Variables and attributes may not begin with underscores: '%s'" % var)

                else:

                    var_obj = Variable(var)

            else:
@@ -678,6 +676,8 @@ class Variable(object): 
            except ValueError:

                # Otherwise we'll set self.lookups so that resolve() knows we're

                # dealing with a bonafide variable

                if var.find(VARIABLE_ATTRIBUTE_SEPARATOR + '_') > -1 or var[0] == '_':

                    raise TemplateSyntaxError("Variables and attributes may not begin with underscores: '%s'" % var)

                self.lookups = tuple(var.split(VARIABLE_ATTRIBUTE_SEPARATOR))



    def resolve(self, context):

tests/regressiontests/templates/parser.py

+13 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ u"Some 'Bad' News" 
[]

>>> fe.var

u'Some "Good" News'



Filtered variables should reject access of attributes beginning with underscores.



>>> FilterExpression('article._hidden|upper', p)

Traceback (most recent call last):

...

TemplateSyntaxError: Variables and attributes may not begin with underscores: 'article._hidden'

"""



variable_parsing = r"""
@@ -56,4 +63,10 @@ u'Some "Good" News' 
>>> Variable(ur"'Some \'Better\' News'").resolve(c)

u"Some 'Better' News"



Variables should reject access of attributes beginning with underscores.



>>> Variable('article._hidden')

Traceback (most recent call last):

...

TemplateSyntaxError: Variables and attributes may not begin with underscores: 'article._hidden'

"""