diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-05-13 18:42:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 18:42:31 (GMT) |
| commit | 336dc523a4180f99955b0fdb65e86059a1abac32 (patch) | |
| tree | 89f1da87d17c0bfde0caff3acb0b2f10d828e62b /Tools | |
| parent | c55ff1b352f8b82184f80d9dea220e832691acfc (diff) | |
| download | cpython-336dc523a4180f99955b0fdb65e86059a1abac32.zip cpython-336dc523a4180f99955b0fdb65e86059a1abac32.tar.gz cpython-336dc523a4180f99955b0fdb65e86059a1abac32.tar.bz2 | |
bpo-44125: Fix "make patchcheck" on non-English locale (GH-26102)
The patch from [bpo-44074]() does not account for a possibly non-English locale and blindly greps for "HEAD branch" in a possibly localized text.
Automerge-Triggered-By: GH:pitrou
(cherry picked from commit 1aa3530314d339725519f4ad95b7dea4b00b657e)
Co-authored-by: Antoine Pitrou <antoine@python.org>
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/scripts/patchcheck.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index d9cceb5..8e59c78 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -78,11 +78,14 @@ def get_git_remote_default_branch(remote_name): It is typically called 'main', but may differ """ cmd = "git remote show {}".format(remote_name).split() + env = os.environ.copy() + env['LANG'] = 'C' try: remote_info = subprocess.check_output(cmd, stderr=subprocess.DEVNULL, cwd=SRCDIR, - encoding='UTF-8') + encoding='UTF-8', + env=env) except subprocess.CalledProcessError: return None for line in remote_info.splitlines(): |