p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a small thread safety issue in ExtendsNode. No tests, but Malcolm said that's ok, honest. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Beaven 2011-08-27 04:55:02 +00:00
parent 4c8f2dca21
commit f85b96121a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/template/loader_tags.py
View File

@ -88,8 +88,9 @@ class ExtendsNode(Node):
def get_parent(self, context): def get_parent(self, context):
if self.parent_name_expr: if self.parent_name_expr:
self.parent_name = self.parent_name_expr.resolve(context) parent = self.parent_name_expr.resolve(context)
parent = self.parent_name else:
parent = self.parent_name
if not parent: if not parent:
error_msg = "Invalid template name in 'extends' tag: %r." % parent error_msg = "Invalid template name in 'extends' tag: %r." % parent
if self.parent_name_expr: if self.parent_name_expr: