test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Gary Wilson Jr 2008-03-21 21:39:50 +00:00
parent c364b6b361
commit 6e2c677ef9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/core/mail.py
View File

@ -38,8 +38,9 @@ class CachedDnsName(object):
DNS_NAME = CachedDnsName() DNS_NAME = CachedDnsName()
# Copied from Python standard library and modified to used the cached hostname # Copied from Python standard library, with the following modifications:
# for performance. # * Used cached hostname for performance.
# * Added try/except to support lack of getpid() in Jython (#5496).
def make_msgid(idstring=None): def make_msgid(idstring=None):
"""Returns a string suitable for RFC 2822 compliant Message-ID, e.g: """Returns a string suitable for RFC 2822 compliant Message-ID, e.g:
@ -53,7 +54,7 @@ def make_msgid(idstring=None):
try: try:
pid = os.getpid() pid = os.getpid()
except AttributeError: except AttributeError:
# Not getpid() in Jython, for example. # No getpid() in Jython, for example.
pid = 1 pid = 1
randint = random.randrange(100000) randint = random.randrange(100000)
if idstring is None: if idstring is None: