[PATCH stable] py3: use pycompat.bytestr() instead of pycompat.sysstr()

Manuel Jacob me at manueljacob.de
Tue Nov 19 10:59:53 UTC 2019


# HG changeset patch
# User Manuel Jacob <me at manueljacob.de>
# Date 1574161183 -3600
#      Tue Nov 19 11:59:43 2019 +0100
# Branch stable
# Node ID c5bcd946a34b77d7680d62ea329542a06d48b5df
# Parent  0f82b29f7494399c93920543ce65bf9258459cd5
py3: use pycompat.bytestr() instead of pycompat.sysstr()

pycompat.sysstr() doesn’t work because it doesn’t accept arguments of type
`type` and returns a unicode object on Python3, while the format string wants
a bytes-like object.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1568,7 +1568,7 @@
             else:
                 raise error.ProgrammingError(
                     b"unsupported changeid '%s' of type %s"
-                    % (changeid, pycompat.sysstr(type(changeid)))
+                    % (changeid, pycompat.bytestr(type(changeid)))
                 )
 
             return context.changectx(self, rev, node)


More information about the Mercurial-devel mailing list