Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Antoine Pitrou 2021-05-13 19:48:15 +02:00 committed by GitHub
parent 3c0b070f3b
commit 1aa3530314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/scripts/patchcheck.py
View File

@ -78,11 +78,14 @@ def get_git_remote_default_branch(remote_name):
It is typically called 'main', but may differ It is typically called 'main', but may differ
""" """
cmd = "git remote show {}".format(remote_name).split() cmd = "git remote show {}".format(remote_name).split()
env = os.environ.copy()
env['LANG'] = 'C'
try: try:
remote_info = subprocess.check_output(cmd, remote_info = subprocess.check_output(cmd,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
cwd=SRCDIR, cwd=SRCDIR,
encoding='UTF-8') encoding='UTF-8',
env=env)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return None return None
for line in remote_info.splitlines(): for line in remote_info.splitlines():