p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #26580 -- Updated references to obsolete RFC 2822. 

Didn't rename django.utils.feedgenerator.rfc2822_date()
as some external code may rely on it.
This commit is contained in:
Vasiliy Faronov 2016-05-04 13:45:31 +03:00 committed by Tim Graham
parent 207c5b4acd
commit 31e0314979
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/mail/message.py
View File

@ -44,7 +44,7 @@ class BadHeaderError(ValueError):
# TODO: replace with email.utils.make_msgid(.., domain=DNS_NAME) when dropping
# Python 2 (Python 2's version doesn't have domain parameter) (#23905).
def make_msgid(idstring=None, domain=None):
"""Returns a string suitable for RFC 2822 compliant Message-ID, e.g:
"""Returns a string suitable for RFC 5322 compliant Message-ID, e.g:
<20020201195627.33539.96671@nightshade.la.mastaler.com>

2
django/utils/dateformat.py
View File

@ -293,7 +293,7 @@ class DateFormat(TimeFormat):
return self.data.isocalendar()[0]
def r(self):
"RFC 2822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
"RFC 5322 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
return self.format('D, j M Y H:i:s O')
def S(self):

2
docs/ref/templates/builtins.txt
View File

@ -1352,7 +1352,7 @@ P Time, in 12-hour hours, minutes and ``'1 a.m.'``, ``'1:3
if they're zero and the special-case
strings 'midnight' and 'noon' if
appropriate. Proprietary extension.
r :rfc:`2822` formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
r :rfc:`5322` formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
month, 2 characters.