# HG changeset patch # User Augie Fackler # Date 2019-01-31 00:43:43 # Node ID 8c13f7b0ace653a521a1a063d93cd58fd1f43e19 # Parent a5d8824483ba3b277fc5ccb3c5571e0963bb6c3e tests: alter email `From` line to a value that's consistently parsed Python2: >>> email.header.decode_header('=?UTF-8?q?Rapha=C3=ABl=20Hertzog?= ') [('Rapha\xc3\xabl Hertzog', 'utf-8'), ('', None)] Python3: >>> email.header.decode_header('=?UTF-8?q?Rapha=C3=ABl=20Hertzog?= ') [(b'Rapha\xc3\xabl Hertzog', 'utf-8'), (b' ', None)] So alter the input to an input that parses to the same result consistently. After skimming the relevant RFC (1342), I'm not sure if what we had was valid, or how I could modify it to be more consistent. Differential Revision: https://phab.mercurial-scm.org/D5769 diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -311,6 +311,7 @@ test-impexp-branch.t test-import-bypass.t test-import-context.t test-import-eol.t +test-import-git.t test-import-merge.t test-import-unknown.t test-import.t diff --git a/tests/test-import-git.t b/tests/test-import-git.t --- a/tests/test-import-git.t +++ b/tests/test-import-git.t @@ -826,7 +826,7 @@ Test email metadata $ hg revert -qa $ hg --encoding utf-8 import - < From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= + > From: =?utf-8?q?Rapha=C3=ABl_Hertzog_=3Chertzog=40debian=2Eorg=3E?= > Subject: [PATCH] =?UTF-8?q?=C5=A7=E2=82=AC=C3=9F=E1=B9=AA?= > > diff --git a/a b/a