[PATCH 1 of 4 py3 v2] encoding: make encoding.encoding be a native str and add encodingb

Yuya Nishihara yuya at tcha.org
Sun Mar 12 18:08:09 EDT 2017


On Sun, 12 Mar 2017 17:51:15 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie at google.com>
> # Date 1489303712 14400
> #      Sun Mar 12 03:28:32 2017 -0400
> # Node ID 4455c6cdbf1e9cd524b43c69ecefef819e0b4e30
> # Parent  7dd2f51f38ac224cec522d093ff6f805beb0dd3e
> encoding: make encoding.encoding be a native str and add encodingb
> 
> It turns out we need the encoding name both ways. Ugh.
> 
> diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
> --- a/mercurial/debugcommands.py
> +++ b/mercurial/debugcommands.py
> @@ -965,7 +965,7 @@ def debuginstall(ui, **opts):
>      fm.startitem()
>  
>      # encoding
> -    fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
> +    fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encodingb())

We have much more uses of encoding.encoding expecting bytes. Better to make
encodingu() a function?

% grep encoding.encoding **/*.py | grep -v sysstr | wc -l
41


More information about the Mercurial-devel mailing list