summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2006-04-18 13:41:21 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2006-04-18 13:41:21 +0000
commit4b3048d8a9ddc023dfb59df20ba5668e43666216 (patch)
treeaee478e47038f86d804683cca40bd7c0209cedf7 /django
parent61122231008ead3dca6058de6a43267294b944cf (diff)
magic-removal: Fixed #1198 -- Modified handling of escape characters in filter arguments, and updated unit tests to reflect the change.
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/template/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/template/__init__.py b/django/template/__init__.py
index 26c6b784ae..3ec5cc09f8 100644
--- a/django/template/__init__.py
+++ b/django/template/__init__.py
@@ -519,9 +519,9 @@ class FilterExpression(object):
args = []
constant_arg, i18n_arg, var_arg = match.group("constant_arg", "i18n_arg", "var_arg")
if i18n_arg:
- args.append((False, _(i18n_arg.replace('\\', ''))))
+ args.append((False, _(i18n_arg.replace(r'\"', '"'))))
elif constant_arg:
- args.append((False, constant_arg.replace('\\', '')))
+ args.append((False, constant_arg.replace(r'\"', '"')))
elif var_arg:
args.append((True, var_arg))
filter_func = parser.find_filter(filter_name)