Changeset 6724

Timestamp:

11/28/07 15:04:05 (1 year ago)

Author:

mtredinnick

Message:

Fixed #5890 -- fixed the far edge-case of allowing constant strings inside
template template markers: we now treat embedded, escaped double quotes
consistently with constant string arguments to filters. Patch from Dmitri
Fedortchenko.

Files:

• django/trunk/django/template/__init__.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/__init__.py

@@ -548 +548 @@
-                var, constant, i18n_constant = match.group("var", "constant", "i18n_constant")
-                if i18n_constant:
-
+.replace(r'\"', '"')
-                elif constant:
-
+.replace(r'\"', '"')
-                upto = match.end()
-                if var == None:

django/trunk/tests/regressiontests/templates/tests.py

@@ -268 +268 @@
-            # Embedded newlines make it not-a-tag.
-            'basic-syntax24': ("{{ moo\n }}", {}, "{{ moo\n }}"),
+
+            # Literal strings are permitted inside variables, mostly for i18n
+            # purposes.
+            'basic-syntax25': ('{{ "fred" }}', {}, "fred"),
+            'basic-syntax26': (r'{{ "\"fred\"" }}', {}, "\"fred\""),
+            'basic-syntax27': (r'{{ _("\"fred\"") }}', {}, "\"fred\""),
-
-            # List-index syntax allows a template to access a certain item of a subscriptable object.