# HG changeset patch # User Augie Fackler # Date 1380049832 14400 # Node ID c80feeb715d1ebe9232c00881d43c1bbb594b3fa # Parent 50d721553198cea51c30f53b76d41dc919280097 python2.4: fix imports of sub-packages of the email package These all have an obvious comment so if/when we finally ditch Python 2.4 we can eradicate them easily. diff -r 50d721553198 -r c80feeb715d1 hgext/notify.py --- a/hgext/notify.py Fri Sep 20 09:16:07 2013 -0400 +++ b/hgext/notify.py Tue Sep 24 15:10:32 2013 -0400 @@ -134,6 +134,9 @@ ''' import email, socket, time +# On python2.4 you have to import this by name or they fail to +# load. This was not a problem on Python 2.7. +import email.Parser from mercurial.i18n import _ from mercurial import patch, cmdutil, templater, util, mail import fnmatch diff -r 50d721553198 -r c80feeb715d1 hgext/patchbomb.py --- a/hgext/patchbomb.py Fri Sep 20 09:16:07 2013 -0400 +++ b/hgext/patchbomb.py Tue Sep 24 15:10:32 2013 -0400 @@ -47,6 +47,11 @@ import os, errno, socket, tempfile, cStringIO import email +# On python2.4 you have to import these by name or they fail to +# load. This was not a problem on Python 2.7. +import email.Generator +import email.MIMEMultipart + from mercurial import cmdutil, commands, hg, mail, patch, util from mercurial import scmutil from mercurial.i18n import _ diff -r 50d721553198 -r c80feeb715d1 mercurial/mail.py --- a/mercurial/mail.py Fri Sep 20 09:16:07 2013 -0400 +++ b/mercurial/mail.py Tue Sep 24 15:10:32 2013 -0400 @@ -9,6 +9,10 @@ import util, encoding, sslutil import os, smtplib, socket, quopri, time, sys import email +# On python2.4 you have to import these by name or they fail to +# load. This was not a problem on Python 2.7. +import email.Header +import email.MIMEText _oldheaderinit = email.Header.Header.__init__ def _unifiedheaderinit(self, *args, **kw): diff -r 50d721553198 -r c80feeb715d1 mercurial/patch.py --- a/mercurial/patch.py Fri Sep 20 09:16:07 2013 -0400 +++ b/mercurial/patch.py Tue Sep 24 15:10:32 2013 -0400 @@ -8,6 +8,10 @@ import cStringIO, email, os, errno, re, posixpath import tempfile, zlib, shutil +# On python2.4 you have to import these by name or they fail to +# load. This was not a problem on Python 2.7. +import email.Generator +import email.Parser from i18n import _ from node import hex, nullid, short