summaryrefslogtreecommitdiff
path: root/tests/mail
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-26 20:58:33 +0100
committerClaude Paroz <claude@2xlibre.net>2017-02-07 09:04:04 +0100
commitc651331b34b7c3841c126959e6e52879bc6f0834 (patch)
tree3f93aeb92fc91dcc61649b46d9f26f7aaaff978b /tests/mail
parent4353640ea9495d58fabd0357253b82de3b069408 (diff)
downloaddjango-c651331b34b7c3841c126959e6e52879bc6f0834.tar.gz
Converted usage of ugettext* functions to their gettext* aliases
Thanks Tim Graham for the review.
Diffstat (limited to 'tests/mail')
-rw-r--r--tests/mail/tests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index 242bb57915..74d40c67ce 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -26,7 +26,7 @@ from django.core.mail.message import BadHeaderError, sanitize_address
from django.test import SimpleTestCase, override_settings
from django.test.utils import requires_tz_support
from django.utils.encoding import force_bytes, force_text
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import gettext_lazy
class HeadersCheckMixin:
@@ -177,7 +177,7 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
with self.assertRaises(BadHeaderError):
email.message()
email = EmailMessage(
- ugettext_lazy('Subject\nInjection Test'), 'Content', 'from@example.com', ['to@example.com']
+ gettext_lazy('Subject\nInjection Test'), 'Content', 'from@example.com', ['to@example.com']
)
with self.assertRaises(BadHeaderError):
email.message()
@@ -856,12 +856,12 @@ class BaseEmailBackendTests(HeadersCheckMixin):
String prefix + lazy translated subject = bad output
Regression for #13494
"""
- mail_managers(ugettext_lazy('Subject'), 'Content')
+ mail_managers(gettext_lazy('Subject'), 'Content')
message = self.get_the_message()
self.assertEqual(message.get('subject'), '[Django] Subject')
self.flush_mailbox()
- mail_admins(ugettext_lazy('Subject'), 'Content')
+ mail_admins(gettext_lazy('Subject'), 'Content')
message = self.get_the_message()
self.assertEqual(message.get('subject'), '[Django] Subject')
@@ -926,7 +926,7 @@ class BaseEmailBackendTests(HeadersCheckMixin):
"""
Email sending should support lazy email addresses (#24416).
"""
- _ = ugettext_lazy
+ _ = gettext_lazy
self.assertTrue(send_mail('Subject', 'Content', _('tester'), [_('django')]))
message = self.get_the_message()
self.assertEqual(message.get('from'), 'tester')