gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py
index 9d2e2abe96..be59234342 100644
--- a/tests/regressiontests/mail/tests.py
+++ b/tests/regressiontests/mail/tests.py
@@ -3,6 +3,7 @@ r"""
 # Tests for the django.core.mail.
 
 >>> from django.core.mail import EmailMessage
+>>> from django.utils.translation import ugettext_lazy
 
 # Test normal ascii character case:
 
@@ -36,6 +37,12 @@ r"""
 >>> message = email.message()
 Traceback (most recent call last):
     ...
-BadHeaderError: Header values can't contain newlines (got 'Subject\nInjection Test' for header 'Subject')
+BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection Test' for header 'Subject')
+
+>>> email = EmailMessage(ugettext_lazy('Subject\nInjection Test'), 'Content', 'from@example.com', ['to@example.com'])
+>>> message = email.message()
+Traceback (most recent call last):
+    ...
+BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection Test' for header 'Subject')
 
 """