mirror of https://github.com/django/django.git
Noted an additional modification we have made to `make_msgid`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
c364b6b361
commit
6e2c677ef9
|
@ -38,8 +38,9 @@ class CachedDnsName(object):
|
|||
|
||||
DNS_NAME = CachedDnsName()
|
||||
|
||||
# Copied from Python standard library and modified to used the cached hostname
|
||||
# for performance.
|
||||
# Copied from Python standard library, with the following modifications:
|
||||
# * Used cached hostname for performance.
|
||||
# * Added try/except to support lack of getpid() in Jython (#5496).
|
||||
def make_msgid(idstring=None):
|
||||
"""Returns a string suitable for RFC 2822 compliant Message-ID, e.g:
|
||||
|
||||
|
@ -53,7 +54,7 @@ def make_msgid(idstring=None):
|
|||
try:
|
||||
pid = os.getpid()
|
||||
except AttributeError:
|
||||
# Not getpid() in Jython, for example.
|
||||
# No getpid() in Jython, for example.
|
||||
pid = 1
|
||||
randint = random.randrange(100000)
|
||||
if idstring is None:
|
||||
|
|
Loading…
Reference in New Issue