Ticket #3713: mail.diff

django/core/mail.py

@@ -5 +5 @@
 from email.Header import Header
 from email.Utils import formatdate
 import smtplib
-import socket
-import time
-import random
 
-# Cache the hostname, but do it lazily: socket.getfqdn() can take a couple of
-# seconds, which slows down the restart of the server.
-class CachedDnsName(object):
-    def __str__(self):
-        return self.get_fqdn()
+try:
+    from email.Utils import make_msgid
+except ImportError:
+    from email.utils import make_msgid
 
-    def get_fqdn(self):
-        if not hasattr(self, '_fqdn'):
-            self._fqdn = socket.getfqdn()
-        return self._fqdn
-
-DNS_NAME = CachedDnsName()
-
 class BadHeaderError(ValueError):
     pass
 
@@ -80 +69 @@
         msg['From'] = from_email
         msg['To'] = ', '.join(recipient_list)
         msg['Date'] = formatdate()
+        msg['Message-ID'] = make_msgid()
         try:
-            random_bits = str(random.getrandbits(64))
-        except AttributeError: # Python 2.3 doesn't have random.getrandbits().
-            random_bits = ''.join([random.choice('1234567890') for i in range(19)])
-        msg['Message-ID'] = "<%d.%s@%s>" % (time.time(), random_bits, DNS_NAME)
-        try:
             server.sendmail(from_email, recipient_list, msg.as_string())
             num_sent += 1
         except: