Commit b5b5d3c2 authored Feb 28, 2011 by Ramiro Morales

[1.2.X] Fixed #15520 -- Fixed incompatibility with email module shipped with...

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

Backport of [15675] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15676 bcc190cf-cafb-0310-a4f2-bffc1f526a37

parent a5f71e12

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