Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 43156:0e6a7ce81dde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use email.generator.BytesGenerator in patch.split() This fixes test-import.t on python3. We add Generator alias in mail module to handle python2/python3 compatibility.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Thu, 10 Oct 2019 10:48:57 +0200
parents a83c9c79b722
children a5b04863dbff
comparison
equal deleted inserted replaced
43155:a83c9c79b722 43156:0e6a7ce81dde
9 from __future__ import absolute_import, print_function 9 from __future__ import absolute_import, print_function
10 10
11 import collections 11 import collections
12 import contextlib 12 import contextlib
13 import copy 13 import copy
14 import email
15 import errno 14 import errno
16 import hashlib 15 import hashlib
17 import os 16 import os
18 import re 17 import re
19 import shutil 18 import shutil
105 yield c 104 yield c
106 105
107 def mimesplit(stream, cur): 106 def mimesplit(stream, cur):
108 def msgfp(m): 107 def msgfp(m):
109 fp = stringio() 108 fp = stringio()
110 g = email.Generator.Generator(fp, mangle_from_=False) 109 g = mail.Generator(fp, mangle_from_=False)
111 g.flatten(m) 110 g.flatten(m)
112 fp.seek(0) 111 fp.seek(0)
113 return fp 112 return fp
114 113
115 for line in stream: 114 for line in stream: