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
django · Feb 28, 2011 · b1a0ad0 · b1a0ad0
1 parent 13838fb
commit b1a0ad0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/django/core/mail/message.py b/django/core/mail/message.py
@@ -3,7 +3,10 @@
 import random
 import time
 from email import Charset, Encoders
-from email.generator import Generator
+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