Index: django/template/defaultfilters.py
===================================================================
--- django/template/defaultfilters.py (Revision 4234)
+++ django/template/defaultfilters.py (Arbeitskopie)
@@ -289,11 +289,18 @@
"""
def _helper(value, tabs):
indent = '\t' * tabs
- if value[1]:
- return '%s
%s\n%s\n%s' % (indent, value[0], indent,
- '\n'.join([_helper(v, tabs+1) for v in value[1]]), indent, indent)
+ if type(value) is type([]):
+ if value[1]:
+ if type(value[1]) is type([]):
+ return '%s%s\n%s\n%s' % (indent, value[0], indent,
+ '\n'.join([_helper(v, tabs+1) for v in value[1]]), indent, indent)
+ else:
+ return '\n'.join([_helper(v, tabs) for v in value])
+ else:
+ return('%s%s' % (indent, value[0]))
else:
- return '%s%s' % (indent, value[0])
+ return('%s%s' % (indent, value))
+
return _helper(value, 1)
###################