Changeset 3112

Timestamp:

06/07/06 23:29:10 (2 years ago)

Author:

adrian

Message:

Added django.template.Token.split_contents() and used it to add support for strings with spaces in {% ifchanged %}

Files:

• django/trunk/django/template/defaulttags.py (modified) (1 diff)
• django/trunk/django/template/__init__.py (modified) (7 diffs)
• django/trunk/tests/othertests/templates.py (modified) (1 diff)

django/trunk/django/template/defaulttags.py

@@ -503 +503 @@
-        {% endifnotequal %}
-    """
-token.contents.split(
+list(token.split_contents()
-    if len(bits) != 3:
-        raise TemplateSyntaxError, "%r takes two arguments" % bits[0]

django/trunk/django/template/__init__.py

@@ -57 +57 @@
-import re
-from inspect import getargspec
-from django.utils.functional import curry
-from django.conf import settings
-from django.template.context import Context, RequestContext, ContextPopException
+from django.utils.functional import curry
+from django.utils.text import smart_split
-
-__all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
@@ -164 +165 @@
-
-    def __str__(self):
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-class Lexer(object):
@@ -368 +365 @@
-            e.source = token.source
-
-
-def lexer_factory(*args, **kwargs):
-    if settings.TEMPLATE_DEBUG:
@@ -380 +376 @@
-    else:
-        return Parser(*args, **kwargs)
-
-
-class TokenParser:
@@ -565 +560 @@
-        provided = list(provided)
-        plen = len(provided)
-(args, varargs, varkw, defaults)
+args, varargs, varkw, defaults
-        # First argument is filter input.
-        args.pop(0)
@@ -821 +816 @@
-
-    def simple_tag(self,func):
-(params, xx, xxx, defaults)
+params, xx, xxx, defaults
-
-        class SimpleNode(Node):
@@ -838 +833 @@
-    def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
-        def dec(func):
-(params, xx, xxx, defaults)
+params, xx, xxx, defaults
-            if takes_context:
-                if params[0] == 'context':

django/trunk/tests/othertests/templates.py

@@ -307 +307 @@
-    'ifequal09': ('{% ifequal a "test" %}yes{% else %}no{% endifequal %}', {}, "no"),
-    'ifequal10': ('{% ifequal a b %}yes{% else %}no{% endifequal %}', {}, "yes"),
+
+    # SMART SPLITTING
+    'ifequal-split01': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {}, "no"),
+    'ifequal-split02': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {'a': 'foo'}, "no"),
+    'ifequal-split03': ('{% ifequal a "test man" %}yes{% else %}no{% endifequal %}', {'a': 'test man'}, "yes"),
+    'ifequal-split04': ("{% ifequal a 'test man' %}yes{% else %}no{% endifequal %}", {'a': 'test man'}, "yes"),
+    'ifequal-split05': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': ''}, "no"),
+    'ifequal-split06': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': 'i "love" you'}, "yes"),
+    'ifequal-split07': ("{% ifequal a 'i \"love\" you' %}yes{% else %}no{% endifequal %}", {'a': 'i love you'}, "no"),
+    'ifequal-split08': (r"{% ifequal a 'I\'m happy' %}yes{% else %}no{% endifequal %}", {'a': "I'm happy"}, "yes"),
+    'ifequal-split09': (r"{% ifequal a 'slash\man' %}yes{% else %}no{% endifequal %}", {'a': r"slash\man"}, "yes"),
+    'ifequal-split10': (r"{% ifequal a 'slash\man' %}yes{% else %}no{% endifequal %}", {'a': r"slashman"}, "no"),
-
-    ### IFNOTEQUAL TAG ########################################################