crecord: convert an instance of bytes to str stable
authorMatt Harbison <matt_harbison@yahoo.com>
Fri, 12 Mar 2021 18:55:06 -0500
branchstable
changeset 46701 c6d9948e865f
parent 46700 279edaaea711
child 46702 56483ab91e66
crecord: convert an instance of bytes to str Caught by pytype: File "/mnt/c/Users/Matt/hg/mercurial/crecord.py", line 1154, in printstring: Function _CursesWindow.addstr was called with the wrong arguments [wrong-arg-types] Expected: (self, str: str, ...) Actually passed: (self, str: bytes, ...) Differential Revision: https://phab.mercurial-scm.org/D10203
mercurial/crecord.py
--- a/mercurial/crecord.py	Fri Mar 12 18:51:22 2021 -0500
+++ b/mercurial/crecord.py	Fri Mar 12 18:55:06 2021 -0500
@@ -1152,7 +1152,7 @@
             numtrailingspaces = origlen - strippedlen
 
         if towin:
-            window.addstr(text, colorpair)
+            window.addstr(encoding.strfromlocal(text), colorpair)
         t += text
 
         if showwhtspc: