summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMattias Loverot <mattias@stubin.se>2016-08-16 12:07:03 +0200
committerTim Graham <timograham@gmail.com>2016-08-25 16:12:40 -0400
commit2315114090815aed72be2b9bc936d7b6374f12fc (patch)
tree6caf23c46dfc24c499fb624a729058973c1e2ef6 /tests
parent13c3e5d5a05e9c358d212d154addd703cac3bc66 (diff)
Fixed #27067 -- Deprecated string_concat() in favor of format_lazy().
Diffstat (limited to 'tests')
-rw-r--r--tests/i18n/tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index b6aeae8caa..b0f77cfe06 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -16,10 +16,12 @@ from django.conf import settings
from django.conf.urls.i18n import i18n_patterns
from django.template import Context, Template, TemplateSyntaxError
from django.test import (
- RequestFactory, SimpleTestCase, TestCase, override_settings,
+ RequestFactory, SimpleTestCase, TestCase, ignore_warnings,
+ override_settings,
)
from django.utils import six, translation
from django.utils._os import upath
+from django.utils.deprecation import RemovedInDjango21Warning
from django.utils.formats import (
date_format, get_format, get_format_modules, iter_format_modules, localize,
localize_input, reset_format_cache, sanitize_separators, time_format,
@@ -417,6 +419,7 @@ class TranslationTests(SimpleTestCase):
' super results{% endblocktrans %}'
)
+ @ignore_warnings(category=RemovedInDjango21Warning)
def test_string_concat(self):
"""
six.text_type(string_concat(...)) should not raise a TypeError - #4796