Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit f85b96121aa267dade4391b3eeb0ffbf64b32f12 1 parent 4c8f2dc
@SmileyChris SmileyChris authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 django/template/loader_tags.py
View
5 django/template/loader_tags.py
@@ -88,8 +88,9 @@ def __repr__(self):
def get_parent(self, context):
if self.parent_name_expr:
- self.parent_name = self.parent_name_expr.resolve(context)
- parent = self.parent_name
+ parent = self.parent_name_expr.resolve(context)
+ else:
+ parent = self.parent_name
if not parent:
error_msg = "Invalid template name in 'extends' tag: %r." % parent
if self.parent_name_expr:
Please sign in to comment.
Something went wrong with that request. Please try again.