Changeset 1690

Timestamp:

12/15/05 23:33:24 (3 years ago)

Author:

adrian

Message:

Changed resolve_variable to resolve integers and floats as integers and floats. Added ifequal unit tests. Refs #959

Files:

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

django/trunk/django/core/template/__init__.py

@@ -630 +630 @@
-    Returns the resolved variable, which may contain attribute syntax, within
-    the given context. The variable may be a hard-coded string (if it begins
-
+, or an integer or float literal
-
-    >>> c = {'article': {'section':'News'}}
@@ -646 +646 @@
-    (The example assumes VARIABLE_ATTRIBUTE_SEPARATOR is '.')
-    """
-
+
+
+
+
+
+
+
-        current = path[1:-1]
-    else:

django/trunk/tests/othertests/templates.py

@@ -164 +164 @@
-    'ifequal09': ('{% ifequal a "test" %}yes{% else %}no{% endifequal %}', {}, "no"),
-    'ifequal10': ('{% ifequal a b %}yes{% else %}no{% endifequal %}', {}, "yes"),
+
+    # Integers
+    'ifequal11': ('{% ifequal a 1 %}yes{% else %}no{% endifequal %}', {}, "no"),
+    'ifequal12': ('{% ifequal a 1 %}yes{% else %}no{% endifequal %}', {"a": 1}, "yes"),
+    'ifequal13': ('{% ifequal a 1 %}yes{% else %}no{% endifequal %}', {"a": "1"}, "no"),
+    'ifequal14': ('{% ifequal a "1" %}yes{% else %}no{% endifequal %}', {"a": 1}, "no"),
+    'ifequal15': ('{% ifequal a "1" %}yes{% else %}no{% endifequal %}', {"a": "1"}, "yes"),
+
+    # Floats
+    'ifequal16': ('{% ifequal a 1.2 %}yes{% else %}no{% endifequal %}', {}, "no"),
+    'ifequal17': ('{% ifequal a 1.2 %}yes{% else %}no{% endifequal %}', {"a": 1.2}, "yes"),
+    'ifequal18': ('{% ifequal a 1.2 %}yes{% else %}no{% endifequal %}', {"a": "1.2"}, "no"),
+    'ifequal19': ('{% ifequal a "1.2" %}yes{% else %}no{% endifequal %}', {"a": 1.2}, "no"),
+    'ifequal20': ('{% ifequal a "1.2" %}yes{% else %}no{% endifequal %}', {"a": "1.2"}, "yes"),
-
-    ### IFNOTEQUAL TAG ########################################################