From b5b5d3c2800dae65cbd5466212844a422f7c95d8 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Mon, 28 Feb 2011 14:09:58 +0000 Subject: [PATCH] [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 --- django/core/mail/message.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django/core/mail/message.py b/django/core/mail/message.py index f63157e75f..50d5a5454c 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -3,7 +3,10 @@ import os 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