[Python-checkins] bpo-44125: Fix "make patchcheck" on non-English locale (GH-26102)

miss-islington webhook-mailer at python.org
Thu May 13 14:14:31 EDT 2021


https://github.com/python/cpython/commit/04ce4c773667b0d9d05a89aea4720f8cf84e834e
commit: 04ce4c773667b0d9d05a89aea4720f8cf84e834e
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-05-13T11:14:23-07:00
summary:

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 at python.org>

files:
M Tools/scripts/patchcheck.py

diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index d9cceb5d5acdfd..8e59c78a4c5844 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():



More information about the Python-checkins mailing list