Author: SmileyChris
Date: 2011-08-26 21:55:02 -0700 (Fri, 26 Aug 2011)
New Revision: 16700
Modified:
django/trunk/django/template/loader_tags.py
Log:
Fix a small thread safety issue in ExtendsNode. No tests, but Malcolm said
that's ok, honest.
Modified: django/trunk/django/template/loader_tags.py
===================================================================
--- django/trunk/django/template/loader_tags.py 2011-08-27 02:56:18 UTC (rev
16699)
+++ django/trunk/django/template/loader_tags.py 2011-08-27 04:55:02 UTC (rev
16700)
@@ -88,8 +88,9 @@
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:
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
