Ticket #3007: messageid.patch

django/core/mail.py

@@ -8 +8 @@
 import time
 import random
 
+# Cache the hostname
+DNS_NAME = socket.getfqdn()
+
 class BadHeaderError(ValueError):
     pass
 
@@ -53 +56 @@
         msg['From'] = from_email
         msg['To'] = ', '.join(recipient_list)
         msg['Date'] = rfc822.formatdate()
-        msg['Message-ID'] = "<%d.%d@%s>" % (time.time(), random.getrandbits(64), socket.getfqdn())
         try:
+            random_bits = str(random.getrandbits(64))
+        except AttributeError:  # Python 2.3 fallback
+            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: