Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 38197:aac4be30e250
py3: wrap tempfile.mkstemp() to use bytes path
This patch just flips the default to use a bytes path on Python 3.
ca1cf9b3cce7 is backed out as the bundlepath should be bytes now.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 26 May 2018 12:14:04 +0900 |
parents | dea3903175ee |
children | 2ce60954b1b7 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu May 03 18:39:58 2018 +0900 +++ b/mercurial/filemerge.py Sat May 26 12:14:04 2018 +0900 @@ -724,7 +724,7 @@ name += ext f = open(name, r"wb") else: - fd, name = tempfile.mkstemp(prefix=pre + '.', suffix=ext) + fd, name = pycompat.mkstemp(prefix=pre + '.', suffix=ext) f = os.fdopen(fd, r"wb") return f, name