From cf010254e666ef84b069c8c90fbfc920bf2fca02 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Sat, 21 Nov 2009 18:19:40 -0500
Subject: [PATCH] Sync to puppet version.

---
 scripts/upload.cgi/upload.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/upload.cgi/upload.cgi b/scripts/upload.cgi/upload.cgi
index 11e9c05..bcd887c 100644
--- a/scripts/upload.cgi/upload.cgi
+++ b/scripts/upload.cgi/upload.cgi
@@ -13,7 +13,12 @@ import tempfile
 import grp
 import syslog
 import smtplib
-from email.mine.text import MIMEText
+
+try:
+    from email.mime.text import MIMEText
+except ImportError:
+    from email import MIMEText
+
 try:
     import hashlib
     md5_constructor = hashlib.md5