Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 19810:c80feeb715d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Augie Fackler <raf@durin42.com>
date Tue, 24 Sep 2013 15:10:32 -0400
parents b054a241257d
children 7032dcff290c
line wrap: on
line diff
--- 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