epylog December 2011

epylog@lists.fedorahosted.org

2 participants
2 discussions

[epylog] Fix email imports on older Pythons
by Konstantin Ryabitsev 14 Dec '11

14 Dec '11

commit 600ea2b74a23efddfe2e7684bf33019d24049e36 Author: Maxim Burgerhout <maxim(a)wzzrd.com> Date: Wed Dec 14 11:37:19 2011 +0100 Fix email imports on older Pythons email.mime.base only exists in newer versions of Python. Older versions, like the version of Python on RHEL5 need email.MIMEBase to import from. py/epylog/publishers.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) --- diff --git a/py/epylog/publishers.py b/py/epylog/publishers.py index 3b57c9a..f0142ea 100644 --- a/py/epylog/publishers.py +++ b/py/epylog/publishers.py @@ -261,9 +261,14 @@ class MailPublisher: outfh.close() logger.puthang(3, 'Creating an email message') - from email.mime.base import MIMEBase - from email.mime.text import MIMEText - from email.mime.multipart import MIMEMultipart + try: + from email.mime.base import MIMEBase + from email.mime.text import MIMEText + from email.mime.multipart import MIMEMultipart + except ImportError: + from email.MIMEBase import MIMEBase + from email.MIMEText import MIMEText + from email.MIMEMultipart import MIMEMultipart logger.put(5, 'Creating a main header') root_part = MIMEMultipart('related')

1 0

[PATCH] Fix email imports on older Pythons
by Maxim Burgerhout 14 Dec '11

14 Dec '11

email.mime.base only exists in newer versions of Python. Older versions, like the version of Python on RHEL5 need email.MIMEBase to import from. --- py/epylog/publishers.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/py/epylog/publishers.py b/py/epylog/publishers.py index 3b57c9a..f0142ea 100644 --- a/py/epylog/publishers.py +++ b/py/epylog/publishers.py @@ -261,9 +261,14 @@ class MailPublisher: outfh.close() logger.puthang(3, 'Creating an email message') - from email.mime.base import MIMEBase - from email.mime.text import MIMEText - from email.mime.multipart import MIMEMultipart + try: + from email.mime.base import MIMEBase + from email.mime.text import MIMEText + from email.mime.multipart import MIMEMultipart + except ImportError: + from email.MIMEBase import MIMEBase + from email.MIMEText import MIMEText + from email.MIMEMultipart import MIMEMultipart logger.put(5, 'Creating a main header') root_part = MIMEMultipart('related') -- 1.7.7.4

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

epylog December 2011