summaryrefslogtreecommitdiff
path: root/django/template
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-07-10 10:48:08 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2006-07-10 10:48:08 +0000
commit927d87d73207c0fbc6200386407787c2dd205c98 (patch)
tree791fb97d5e32f37111c0aa5c142bae0b41c54675 /django/template
parentc1847294b8c1b97993a945d43e50c56c0486ceed (diff)
Fixed #2320 -- corrected numerous errors in the custom tag examples in
python_templates.txt. Also fixed an argument parsing error for such tags. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/template')
-rw-r--r--django/template/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/template/__init__.py b/django/template/__init__.py
index a1d1d402d0..e898fc7636 100644
--- a/django/template/__init__.py
+++ b/django/template/__init__.py
@@ -171,7 +171,7 @@ class Token(object):
self.contents[:20].replace('\n', ''))
def split_contents(self):
- return smart_split(self.contents)
+ return list(smart_split(self.contents))
class Lexer(object):
def __init__(self, template_string, origin):
@@ -758,7 +758,7 @@ class DebugVariableNode(VariableNode):
def generic_tag_compiler(params, defaults, name, node_class, parser, token):
"Returns a template.Node subclass."
- bits = token.contents.split()[1:]
+ bits = token.split_contents()[1:]
bmax = len(params)
def_len = defaults and len(defaults) or 0
bmin = bmax - def_len