Commit b1a0ad00 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Fixed #15520 -- Fixed incompatibility with email module shipped with Python... 

Fixed #15520 -- Fixed incompatibility with email module shipped with Python 2.4 introduced in r15669. Thanks dobcey for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 13838fb2

django/core/mail/message.py

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ import os 
import random

import time

from email import Charset, Encoders

try:

    from email.generator import Generator

except ImportError:

    from email.Generator import Generator # TODO: Remove when remove Python 2.4 support

from email.MIMEText import MIMEText

from email.MIMEMultipart import MIMEMultipart

from email.MIMEBase import MIMEBase