Ticket #3696: defaulttags.diff

django_src/django/template/defaulttags.py

@@ -435 +435 @@
-cycle = register.tag(cycle)
-
-def debug(parser, token):
+    """
+    Output a whole load of debugging information, including the current context and imported modules.
+
+    Sample usage::
+
+        <pre>
+            {% debug %}
+        </pre>
+    """
-    return DebugNode()
-debug = register.tag(debug)
-
@@ -538 +547 @@
-do_for = register.tag("for", do_for)
-
-def do_ifequal(parser, token, negate):
-    """
-    Output the contents of the block if the two arguments equal/don't equal each other.
-
-    Examples::
-
-        {% ifequal user.id comment.user_id %}
-            ...
-        {% endifequal %}
-
-        {% ifnotequal user.id comment.user_id %}
-            ...
-        {% else %}
-            ...
-        {% endifnotequal %}
-    """
-    bits = list(token.split_contents())
-    if len(bits) != 3:
-        raise TemplateSyntaxError, "%r takes two arguments" % bits[0]
@@ -568 +562 @@
-
-#@register.tag
-def ifequal(parser, token):
+    """
+    Output the contents of the block if the two arguments equal each other.
+
+    Examples::
+
+        {% ifequal user.id comment.user_id %}
+            ...
+        {% endifequal %}
+
+        {% ifnotequal user.id comment.user_id %}
+            ...
+        {% else %}
+            ...
+        {% endifnotequal %}
+    """
-    return do_ifequal(parser, token, False)
-ifequal = register.tag(ifequal)
-
-#@register.tag
-def ifnotequal(parser, token):
+    """Output the contents of the block if the two arguments are not equal. See ifequal"""
-    return do_ifequal(parser, token, True)
-ifnotequal = register.tag(ifnotequal)
-
@@ -889 +899 @@
-
-def url(parser, token):
-    """
-
-
+
-    
+    This is a way to define links that aren't tied to a particular url configuration::
+    
-        {% url path.to.some_view arg1,arg2,name1=value1 %}
-    
-    The first argument is a path to a view. It can be an absolute python path
@@ -901 +912 @@
-    URL. All arguments for the URL should be present.
-
-    For example if you have a view ``app_name.client`` taking client's id and
-
+:
-    
-        ('^client/(\d+)/$', 'app_name.client')
-    
-    and this app's urlconf is included into the project's urlconf under some
-
+:
-    
-        ('^clients/', include('project_name.app_name.urls'))
-    
-
+:
-    
-        {% url app_name.client client.id %}
-