diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2010-03-06 15:50:12 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2010-03-06 15:50:12 +0000 |
| commit | a2c4ad1dabf58130e0c97636dd401bb615f715ee (patch) | |
| tree | dd1c58046f07b1b147aa7c29ceff1f99aff4a57b /django | |
| parent | bb3d93f2905315e179894b225b216524658ded6d (diff) | |
Fixed #6918: Adjusted the test in r12683 to more specifically look for what it is testing so it doesn't get thrown off by other minor differences in email ouput (hopefully). Also put a docstring back in its place.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/mail/message.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 273e47a753..a288d6c5fc 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -55,8 +55,8 @@ def make_msgid(idstring=None): def forbid_multi_line_headers(name, val, encoding): - encoding = encoding or settings.DEFAULT_CHARSET """Forbids multi-line headers, to prevent header injection.""" + encoding = encoding or settings.DEFAULT_CHARSET val = force_unicode(val) if '\n' in val or '\r' in val: raise BadHeaderError("Header values can't contain newlines (got %r for header %r)" % (val, name)) |