Django

Code

Changeset 4058

Show
Ignore:
Timestamp:
11/09/06 21:28:58 (2 years ago)
Author:
adrian
Message:

Fixed #3007 -- Fixed Python 2.4-ism from [4051] in django/core/mail.py. Also cached the result of socket.getfqdn(). Thanks for the patch, SmileyChris?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/mail.py

    r4052 r4058  
    88import time 
    99import random 
     10 
     11DNS_NAME = socket.getfqdn() # Cache the hostname 
    1012 
    1113class BadHeaderError(ValueError): 
    …… 
    5456        msg['To'] = ', '.join(recipient_list) 
    5557        msg['Date'] = rfc822.formatdate() 
    56         msg['Message-ID'] = "<%d.%d@%s>" % (time.time(), random.getrandbits(64), socket.getfqdn()) 
     58        try: 
     59            random_bits = str(random.getrandbits(64)) 
     60        except AttributeError: # Python 2.3 doesn't have random.getrandbits(). 
     61            random_bits = ''.join([random.choice('1234567890') for i in range(19)]) 
     62        msg['Message-ID'] = "<%d.%d@%s>" % (time.time(), random_bits, DNS_NAME) 
    5763        try: 
    5864            server.sendmail(from_email, recipient_list, msg.as_string())