From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 13 May 2021 18:14:23 +0000 (-0700)
Subject: bpo-44125: Fix "make patchcheck" on non-English locale (GH-26102)
X-Git-Tag: v3.9.6~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04ce4c773667b0d9d05a89aea4720f8cf84e834e;p=thirdparty%2FPython%2Fcpython.git

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>
---

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