[PATCH 10 of 10 STABLE] py3: fix generated non-ascii message in test-notify.t

Yuya Nishihara yuya at tcha.org
Fri Oct 25 08:24:11 EDT 2019


On Thu, 24 Oct 2019 17:30:41 +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis.laxalde at logilab.fr>
> # Date 1571930937 -7200
> #      Thu Oct 24 17:28:57 2019 +0200
> # Branch stable
> # Node ID 818013898b850073a6c221e7dcb965aa4daba1e6
> # Parent  b3070247092e461d15f0921618b94a2b1646fdf1
> py3: fix generated non-ascii message in test-notify.t
> 
> The resulting "Subject:" header contains an encoded word in Python 3 so
> we have to add distinct outputs for Python 3 but underlying values are
> the same:
> 
>     >>> from email.header import decode_header
>     >>> decode_header('=?utf-8?b?w6AuLi4=?=')
>     [(b'\xc3\xa0...', 'utf-8')]
> 
> diff --git a/tests/test-notify.t b/tests/test-notify.t
> --- a/tests/test-notify.t
> +++ b/tests/test-notify.t
> @@ -418,8 +418,13 @@ non-ascii content and truncation of mult
>    > maxsubject = 4
>    > EOF
>    $ echo a >> a/a
> +#if py3
> +  $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \
> +  >   -m `"$PYTHON" -c 'print(b"\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4".decode("utf-8"))'`
> +#else
>    $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \
>    >   -m `"$PYTHON" -c 'print("\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4")'`

Can't we just do getattr(sys.stdout, 'buffer', sys.stdout).write(b'...')?


More information about the Mercurial-devel mailing list