From b5b840831a389f9b06587f2d70a600df305ed273 Mon Sep 17 00:00:00 2001 From: hernani Date: Tue, 15 Jun 2010 16:13:35 +0000 Subject: [PATCH] Wrap email imports for python 2.4 compatibility. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@421 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/utils/mail.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/forum/utils/mail.py b/forum/utils/mail.py index 8f6ee50..0d281c2 100644 --- a/forum/utils/mail.py +++ b/forum/utils/mail.py @@ -2,11 +2,16 @@ import email import socket import os -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.mime.image import MIMEImage -from email.header import Header -import email.Charset +try: + from email.mime.multipart import MIMEMultipart + from email.mime.text import MIMEText + from email.mime.image import MIMEImage + from email.header import Header +except: + from email.MIMEMultipart import MIMEMultipart + from email.MIMEText import MIMEText + from email.MIMEImage import MIMEImage + from email.Header import Header from django.core.mail import DNS_NAME from smtplib import SMTP -- 2.39.5