On Thu, 30 Mar 2017 01:21:38 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1490779072 -19800 > # Wed Mar 29 14:47:52 2017 +0530 > # Node ID 7339bf21508131c90a44317ff16214b81ebe62c1 > # Parent 08aeba5bc7c623a700eea9011e0d904e3732134a > color: replace str() with pycompat.bytestr()
Queued these, thanks. > --- a/mercurial/color.py Sun Mar 26 20:52:51 2017 +0530 > +++ b/mercurial/color.py Wed Mar 29 14:47:52 2017 +0530 > @@ -332,9 +332,10 @@ > stop = _effect_str(ui, 'none') > else: > activeeffects = _activeeffects(ui) > - start = [str(activeeffects[e]) for e in ['none'] + effects.split()] > + start = [pycompat.bytestr(activeeffects[e]) for e in ['none'] > + + effects.split()] > start = '\033[' + ';'.join(start) + 'm' > - stop = '\033[' + str(activeeffects['none']) + 'm' > + stop = '\033[' + pycompat.bytestr(activeeffects['none']) + 'm' This could be '%d'. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
