This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8781

infinitepush: fix `{get,put}_args` formatting on Python 3
ClosedPublic

Authored by sheehan on Jul 21 2020, 12:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa098db54bd94: infinitepush: fix `{get,put}_args` formatting on Python 3
rHGe285655c37c5: infinitepush: fix `{get,put}_args` formatting on Python 3
Summary

Calling .format() on a byte-string does not work, thus
causing an exception on Python 3. This commit adds a function
to paper over the difference.

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

sheehan created this revision.Jul 21 2020, 12:40 PM
sheehan added a commit: rHGe285655c37c5: infinitepush: fix `{get,put}_args` formatting on Python 3.Jul 21 2020, 2:03 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe285655c37c5: infinitepush: fix `{get,put}_args` formatting on Python 3 (authored by sheehan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/store.py (31 lines)

Diff 22026

hgext/infinitepush/store.py

def read(self, key): def read(self, key):
try: try:
with open(self._filepath(key), b'rb') as f: with open(self._filepath(key), b'rb') as f:
return f.read() return f.read()
except IOError: except IOError:
return None return None
def format_placeholders_args(args, filename=None, handle=None):
"""Formats `args` with Infinitepush replacements.
Hack to get `str.format()`-ed strings working in a BC way with
bytes.
"""
formatted_args = []
for arg in args:
if filename and arg == b'{filename}':
formatted_args.append(filename)
elif handle and arg == b'{handle}':
formatted_args.append(handle)
else:
formatted_args.append(arg)
return formatted_args
class externalbundlestore(abstractbundlestore): class externalbundlestore(abstractbundlestore):
def __init__(self, put_binary, put_args, get_binary, get_args): def __init__(self, put_binary, put_args, get_binary, get_args):
""" """
`put_binary` - path to binary file which uploads bundle to external `put_binary` - path to binary file which uploads bundle to external
storage and prints key to stdout storage and prints key to stdout
`put_args` - format string with additional args to `put_binary` `put_args` - format string with additional args to `put_binary`
{filename} replacement field can be used. {filename} replacement field can be used.
`get_binary` - path to binary file which accepts filename and key `get_binary` - path to binary file which accepts filename and key
# Won't work on windows because you can't open file second time without # Won't work on windows because you can't open file second time without
# closing it # closing it
# TODO: rewrite without str.format() and replace NamedTemporaryFile() # TODO: rewrite without str.format() and replace NamedTemporaryFile()
# with pycompat.namedtempfile() # with pycompat.namedtempfile()
with pycompat.namedtempfile() as temp: with pycompat.namedtempfile() as temp:
temp.write(data) temp.write(data)
temp.flush() temp.flush()
temp.seek(0) temp.seek(0)
formatted_args = [ formatted_args = format_placeholders_args(
arg.format(filename=temp.name) for arg in self.put_args self.put_args, filename=temp.name
] )
returncode, stdout, stderr = self._call_binary( returncode, stdout, stderr = self._call_binary(
[self.put_binary] + formatted_args [self.put_binary] + formatted_args
) )
if returncode != 0: if returncode != 0:
raise BundleWriteException( raise BundleWriteException(
b'Failed to upload to external store: %s' % stderr b'Failed to upload to external store: %s' % stderr
) )
stdout_lines = stdout.splitlines() stdout_lines = stdout.splitlines()
if len(stdout_lines) == 1: if len(stdout_lines) == 1:
return stdout_lines[0] return stdout_lines[0]
else: else:
raise BundleWriteException( raise BundleWriteException(
b'Bad output from %s: %s' % (self.put_binary, stdout) b'Bad output from %s: %s' % (self.put_binary, stdout)
) )
def read(self, handle): def read(self, handle):
# Won't work on windows because you can't open file second time without # Won't work on windows because you can't open file second time without
# closing it # closing it
# TODO: rewrite without str.format()
with pycompat.namedtempfile() as temp: with pycompat.namedtempfile() as temp:
formatted_args = [ formatted_args = format_placeholders_args(
arg.format(filename=temp.name, handle=handle) self.get_args, filename=temp.name, handle=handle
for arg in self.get_args )
]
returncode, stdout, stderr = self._call_binary( returncode, stdout, stderr = self._call_binary(
[self.get_binary] + formatted_args [self.get_binary] + formatted_args
) )
if returncode != 0: if returncode != 0:
raise BundleReadException( raise BundleReadException(
b'Failed to download from external store: %s' % stderr b'Failed to download from external store: %s' % stderr
) )
return temp.read() return temp.read()