From: Victor Stinner <vstinner@redhat.com>
Date: Thu, 27 Jun 2019 07:04:28 +0000 (+0200)
Subject: bpo-35389: platform.platform() calls libc_ver() without executable (GH-14418)
X-Git-Tag: v3.9.0a1~1154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a719c8f4bd3cc5b1d98700c15c4a818f4d5617a4;p=thirdparty%2FPython%2Fcpython.git

bpo-35389: platform.platform() calls libc_ver() without executable (GH-14418)

When libc_ver() is called with an executable, the
os.confstr('CS_GNU_LIBC_VERSION') fast-path cannot be taken. Modify
platform.platform() to call libc_ver() without executable, instead of
calling libc_ver(sys.executable), since sys.executable is already the
default value.
---

diff --git a/Lib/platform.py b/Lib/platform.py
index 6fbb7b08c598..ed41edc98fe0 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1202,7 +1202,7 @@ def platform(aliased=0, terse=0):
 
     elif system in ('Linux',):
         # check for libc vs. glibc
-        libcname, libcversion = libc_ver(sys.executable)
+        libcname, libcversion = libc_ver()
         platform = _platform(system, release, machine, processor,
                              'with',
                              libcname+libcversion)