| hg-reviewers |
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.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/infinitepush/store.py (31 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| a70f3219590c | 165c38f391ca | Connor Sheehan | Apr 22 2020, 6:08 PM |
| 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() | ||||