Mercurial > hg-stable
changeset 30358:9df29b7c62cf
ui: explicitly open config files in binary mode
This has been working mostly accidentally, but now it works explicitly.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 09 Oct 2016 09:17:49 -0400 |
| parents | 494d5cec0b07 |
| children | 954002426f78 |
| files | mercurial/ui.py tests/test-check-py3-commands.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Wed Nov 09 16:04:44 2016 -0800 +++ b/mercurial/ui.py Sun Oct 09 09:17:49 2016 -0400 @@ -176,7 +176,7 @@ def readconfig(self, filename, root=None, trust=False, sections=None, remap=None): try: - fp = open(filename) + fp = open(filename, u'rb') except IOError: if not sections: # ignore unless we were looking for something return
--- a/tests/test-check-py3-commands.t Wed Nov 09 16:04:44 2016 -0800 +++ b/tests/test-check-py3-commands.t Sun Oct 09 09:17:49 2016 -0400 @@ -9,6 +9,6 @@ > $PYTHON3 `which hg` $cmd 2>&1 2>&1 | tail -1 > done version - TypeError: startswith first arg must be str or a tuple of str, not bytes + TypeError: cannot use a string pattern on a bytes-like object debuginstall - TypeError: startswith first arg must be str or a tuple of str, not bytes + TypeError: cannot use a string pattern on a bytes-like object