Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 25644:c99f9715cc9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: remove email import workaround for Python 2.4 Python 2.6 provides access to the sub-modules just fine. This workaround is no longer needed since we no longer support Python 2.4.
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 22 Jun 2015 10:09:08 -0700
parents 2748bf78a5bf
children e93036747902
comparison
equal deleted inserted replaced
25643:6f6c97d29a1e 25644:c99f9715cc9a
7 # GNU General Public License version 2 or any later version. 7 # GNU General Public License version 2 or any later version.
8 8
9 import collections 9 import collections
10 import cStringIO, email, os, errno, re, posixpath, copy 10 import cStringIO, email, os, errno, re, posixpath, copy
11 import tempfile, zlib, shutil 11 import tempfile, zlib, shutil
12 # On python2.4 you have to import these by name or they fail to
13 # load. This was not a problem on Python 2.7.
14 import email.Generator
15 import email.Parser
16 12
17 from i18n import _ 13 from i18n import _
18 from node import hex, short 14 from node import hex, short
19 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error 15 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error
20 import pathutil 16 import pathutil