From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 28 Jun 2023 03:17:31 +0000 (-0700)
Subject: [3.11] Fix c-analyzer for GCC: ignore LANG env var (GH-106173) (#106177)
X-Git-Tag: v3.11.5~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cc0533459ad7d2de92b0f1b0fcc94f33542f248;p=thirdparty%2FPython%2Fcpython.git

[3.11] Fix c-analyzer for GCC: ignore LANG env var (GH-106173) (#106177)

Fix c-analyzer for GCC: ignore LANG env var (GH-106173)

The c-analyzer doesn't support GCC localized messages, so just unset
the LANG environment variable.
(cherry picked from commit 1f74b9e933d546a015e8497e3b8728357196acc8)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Tools/c-analyzer/c_parser/preprocessor/common.py b/Tools/c-analyzer/c_parser/preprocessor/common.py
index 63681025c63d..5b6384a8441f 100644
--- a/Tools/c-analyzer/c_parser/preprocessor/common.py
+++ b/Tools/c-analyzer/c_parser/preprocessor/common.py
@@ -1,6 +1,7 @@
 import contextlib
 import distutils.ccompiler
 import logging
+import os
 import shlex
 import subprocess
 import sys
@@ -40,7 +41,12 @@ def run_cmd(argv, *,
     kw.pop('kwargs')
     kwargs.update(kw)
 
-    proc = subprocess.run(argv, **kwargs)
+    # Remove LANG environment variable: the C parser doesn't support GCC
+    # localized messages
+    env = dict(os.environ)
+    env.pop('LANG', None)
+
+    proc = subprocess.run(argv, env=env, **kwargs)
     return proc.stdout