This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10129

pycompat: fix a bytes vs str issue in `unnamedtempfile()`
ClosedPublic

Authored by mharbison72 on Mar 8 2021, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7a29d9002250: pycompat: fix a bytes vs str issue in `unnamedtempfile()`
Summary

This seems trivially correct, though the only two uses I found both took this
path. So I'm guessing we're missing test coverage.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Mar 8 2021, 12:29 PM
mharbison72 added a commit: rHG7a29d9002250: pycompat: fix a bytes vs str issue in `unnamedtempfile()`.Mar 8 2021, 1:11 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7a29d9002250: pycompat: fix a bytes vs str issue in `unnamedtempfile()` (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (2 lines)

Diff 26128

mercurial/pycompat.py

def mkstemp(suffix=b'', prefix=b'tmp', dir=None): def mkstemp(suffix=b'', prefix=b'tmp', dir=None):
return tempfile.mkstemp(suffix, prefix, dir) return tempfile.mkstemp(suffix, prefix, dir)
# TemporaryFile does not support an "encoding=" argument on python2. # TemporaryFile does not support an "encoding=" argument on python2.
# This wrapper file are always open in byte mode. # This wrapper file are always open in byte mode.
def unnamedtempfile(mode=None, *args, **kwargs): def unnamedtempfile(mode=None, *args, **kwargs):
if mode is None: if mode is None:
mode = b'w+b' mode = 'w+b'
else: else:
mode = sysstr(mode) mode = sysstr(mode)
assert 'b' in mode assert 'b' in mode
return tempfile.TemporaryFile(mode, *args, **kwargs) return tempfile.TemporaryFile(mode, *args, **kwargs)
# NamedTemporaryFile does not support an "encoding=" argument on python2. # NamedTemporaryFile does not support an "encoding=" argument on python2.
# This wrapper file are always open in byte mode. # This wrapper file are always open in byte mode.
def namedtempfile( def namedtempfile(
mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None, delete=True mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None, delete=True
): ):
mode = sysstr(mode) mode = sysstr(mode)
assert 'b' in mode assert 'b' in mode
return tempfile.NamedTemporaryFile( return tempfile.NamedTemporaryFile(
mode, bufsize, suffix=suffix, prefix=prefix, dir=dir, delete=delete mode, bufsize, suffix=suffix, prefix=prefix, dir=dir, delete=delete
) )