# HG changeset patch # User Yuya Nishihara # Date 1549088811 -32400 # Node ID 549f956ba2a9b9cda3f56ed80583bf1f975cad2e # Parent d65519e5dd044f6f7d6366eba20f460635169b5c py3: don't use universal_newlines in svnsubrepo On Python 3, it means text=True without any specific encoding, which is pretty bad. Instead, use util.fromnativeeol() to translate CR+LF to LF without encoding conversion. diff -r d65519e5dd04 -r 549f956ba2a9 mercurial/subrepo.py --- a/mercurial/subrepo.py Sat Feb 02 15:21:35 2019 +0900 +++ b/mercurial/subrepo.py Sat Feb 02 15:26:51 2019 +0900 @@ -958,10 +958,8 @@ p = subprocess.Popen(pycompat.rapply(procutil.tonativestr, cmd), bufsize=-1, close_fds=procutil.closefds, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - universal_newlines=True, env=procutil.tonativeenv(env), **extrakw) - stdout, stderr = p.communicate() - stdout, stderr = pycompat.fsencode(stdout), pycompat.fsencode(stderr) + stdout, stderr = map(util.fromnativeeol, p.communicate()) stderr = stderr.strip() if not failok: if p.returncode: