From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-182613-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1MsMyJ-0001aa-6Y
	for garchives@archives.gentoo.org; Mon, 28 Sep 2009 20:37:29 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 63523E0729;
	Mon, 28 Sep 2009 20:37:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3CE92E0729
	for <gentoo-commits@lists.gentoo.org>; Mon, 28 Sep 2009 20:37:22 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id D5D26674B5
	for <gentoo-commits@lists.gentoo.org>; Mon, 28 Sep 2009 20:37:21 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1MsMyH-0000pF-1f
	for gentoo-commits@lists.gentoo.org; Mon, 28 Sep 2009 20:37:21 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r14458 - main/trunk/pym/portage
X-VCS-Repository: portage
X-VCS-Revision: 14458
X-VCS-Files: main/trunk/pym/portage/mail.py
X-VCS-Directories: main/trunk/pym/portage
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1MsMyH-0000pF-1f@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Mon, 28 Sep 2009 20:37:21 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: d91d5948-88bc-4719-9d34-9dbd8bf265df
X-Archives-Hash: b47b2f81c8b80752b1ca06bb5874f9d9

Author: zmedico
Date: 2009-09-28 20:37:20 +0000 (Mon, 28 Sep 2009)
New Revision: 14458

Modified:
   main/trunk/pym/portage/mail.py
Log:
Bug #286780 - Fix email.MIME* imports to use email.mime.* (works with pyt=
hon
2.6 and python 3). Thanks to Hanno Meyer-Thurow <h.mth@web.de> for this p=
atch.


Modified: main/trunk/pym/portage/mail.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/pym/portage/mail.py	2009-09-28 20:32:37 UTC (rev 14457)
+++ main/trunk/pym/portage/mail.py	2009-09-28 20:37:20 UTC (rev 14458)
@@ -3,9 +3,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
=20
-from email.MIMEText import MIMEText as TextMessage
-from email.MIMEMultipart import MIMEMultipart as MultipartMessage
-from email.MIMEBase import MIMEBase as BaseMessage
+from email.mime.text import MIMEText as TextMessage
+from email.mime.multipart import MIMEMultipart as MultipartMessage
+from email.mime.base import MIMEBase as BaseMessage
 from email.header import Header
 import smtplib
 import socket