This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10203

crecord: convert an instance of bytes to str
ClosedPublic

Authored by mharbison72 on Mar 13 2021, 2:33 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc6d9948e865f: crecord: convert an instance of bytes to str
Summary

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, ...)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Mar 13 2021, 2:33 PM
pulkit accepted this revision.Mar 17 2021, 4:59 AM
This revision is now accepted and ready to land.Mar 17 2021, 4:59 AM
mharbison72 added a commit: rHGc6d9948e865f: crecord: convert an instance of bytes to str.Mar 17 2021, 6:12 AM
Closed by commit rHGc6d9948e865f: crecord: convert an instance of bytes to str (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/crecord.py (2 lines)

Diff 26476

mercurial/crecord.py

# if requested, show trailing whitespace # if requested, show trailing whitespace
if showwhtspc: if showwhtspc:
origlen = len(text) origlen = len(text)
text = text.rstrip(b' \n') # tabs have already been expanded text = text.rstrip(b' \n') # tabs have already been expanded
strippedlen = len(text) strippedlen = len(text)
numtrailingspaces = origlen - strippedlen numtrailingspaces = origlen - strippedlen
if towin: if towin:
window.addstr(text, colorpair) window.addstr(encoding.strfromlocal(text), colorpair)
t += text t += text
if showwhtspc: if showwhtspc:
wscolorpair = colorpair | curses.A_REVERSE wscolorpair = colorpair | curses.A_REVERSE
if towin: if towin:
for i in range(numtrailingspaces): for i in range(numtrailingspaces):
window.addch(curses.ACS_CKBOARD, wscolorpair) window.addch(curses.ACS_CKBOARD, wscolorpair)
t += b" " * numtrailingspaces t += b" " * numtrailingspaces