Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Tiny logic tightening in core.template.loader -- taken from new-admin

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8a2d9fc2f4e43bcadf480eb01534f79d3b8a4729 1 parent 7911173
@adrianholovaty adrianholovaty authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/core/template/loader.py
View
4 django/core/template/loader.py
@@ -186,14 +186,14 @@ def do_extends(parser, token):
This tag may be used in two ways: ``{% extends "base" %}`` (with quotes)
uses the literal value "base" as the name of the parent template to extend,
- or ``{% entends variable %}`` uses the value of ``variable`` as the name
+ or ``{% extends variable %}`` uses the value of ``variable`` as the name
of the parent template to extend.
"""
bits = token.contents.split()
if len(bits) != 2:
raise TemplateSyntaxError, "'%s' takes one argument" % bits[0]
parent_name, parent_name_var = None, None
- if (bits[1].startswith('"') and bits[1].endswith('"')) or (bits[1].startswith("'") and bits[1].endswith("'")):
+ if bits[1][0] in ('"', "'") and bits[1][-1] == bits[1][0]:
parent_name = bits[1][1:-1]
else:
parent_name_var = bits[1]
Please sign in to comment.
Something went wrong with that request. Please try again.