Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: explicitly open config files in binary mode
authorAugie Fackler <augie@google.com>
Sun, 09 Oct 2016 09:17:49 -0400
changeset 30348 9df29b7c62cf
parent 30347 494d5cec0b07
child 30349 954002426f78
ui: explicitly open config files in binary mode This has been working mostly accidentally, but now it works explicitly.
mercurial/ui.py file | annotate | diff | comparison | revisions
tests/test-check-py3-commands.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial