pythongh-146145: Use _sysconfig.get_platform() in the platform module

vstinner · vstinner · commit 4e482132e358 · 2026-03-19T00:50:47.000+01:00
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -711,6 +711,27 @@ def _syscmd_file(target, default=''):
     'dos': ('', 'MSDOS'),
 })
 
+
+_sysconfig_architecture = frozendict({
+    # platform: (arch, bits, linkage)
+    'win32': ('x86', '32bit', 'WindowsPE'),
+    'win-amd64': ('AMD64', '32bit', 'WindowsPE'),
+    'win-arm32': ('ARM', '32bit', 'WindowsPE'),
+    'win-arm64': ('ARM64', '64bit', 'WindowsPE'),
+})
+
+def _sysconfig_platform():
+    try:
+        import _sysconfig
+    except ImportError:
+        return ('', '', '')
+
+    platform = _sysconfig.get_platform()
+    if platform in _sysconfig_architecture:
+        return _sysconfig_architecture[platform]
+    return ('', '', '')
+
+
 def architecture(executable=sys.executable, bits='', linkage=''):
 
     """ Queries the given executable (defaults to the Python interpreter
@@ -745,10 +766,15 @@ def architecture(executable=sys.executable, bits='', linkage=''):
     else:
         fileout = ''
 
-    if not fileout and \
-       executable == sys.executable:
+    if not fileout and executable == sys.executable:
         # "file" command did not return anything; we'll try to provide
         # some sensible defaults then...
+        if os.name == "nt":
+            # Use _sysconfig.get_platform() if available
+            _, b, l = _sysconfig_platform()
+            if b:
+                return (b, l)
+
         if sys.platform in _default_architecture:
             b, l = _default_architecture[sys.platform]
             if b:
@@ -790,10 +816,10 @@ def architecture(executable=sys.executable, bits='', linkage=''):
 
 
 def _get_machine_win32():
-    # Try to use the PROCESSOR_* environment variables
-    # available on Win XP and later; see
-    # http://support.microsoft.com/kb/888731 and
-    # http://www.geocities.com/rick_lively/MANUALS/ENV/MSWIN/PROCESSI.HTM
+    # Use _sysconfig.get_platform() if available
+    arch, bits, linkage = _sysconfig_platform()
+    if arch:
+        return arch
 
     # WOW64 processes mask the native architecture
     try:
@@ -811,6 +837,11 @@ def _get_machine_win32():
         else:
             if arch:
                 return arch
+
+    # Try to use the PROCESSOR_* environment variables
+    # available on Win XP and later; see
+    # http://support.microsoft.com/kb/888731 and
+    # http://www.geocities.com/rick_lively/MANUALS/ENV/MSWIN/PROCESSI.HTM
     return (
         os.environ.get('PROCESSOR_ARCHITEW6432', '') or
         os.environ.get('PROCESSOR_ARCHITECTURE', '')
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
@@ -379,19 +379,35 @@ def test_uname_win32_ARCHITEW6432(self):
         # using it, per
         # http://blogs.msdn.com/david.wang/archive/2006/03/26/HOWTO-Detect-Process-Bitness.aspx
 
+        for sysconfig_platform, arch in (
+            ('win32', 'x86'),
+            ('win-arm32', 'ARM'),
+            ('win-amd64', 'AMD64'),
+            ('win-arm64', 'ARM64'),
+        ):
+            with mock.patch('_sysconfig.get_platform', return_value=sysconfig_platform):
+                try:
+                    platform._uname_cache = None
+                    system, node, release, version, machine, processor = platform.uname()
+                    self.assertEqual(machine, arch)
+                finally:
+                    platform._uname_cache = None
+
         # We also need to suppress WMI checks, as those are reliable and
         # overrule the environment variables
         def raises_oserror(*a):
             raise OSError()
 
-        with support.swap_attr(platform, '_wmi_query', raises_oserror):
+        with (mock.patch('platform._sysconfig_platform', return_value=('', '', '')),
+              support.swap_attr(platform, '_wmi_query', raises_oserror)):
             with os_helper.EnvironmentVarGuard() as environ:
                 try:
                     del environ['PROCESSOR_ARCHITEW6432']
                     environ['PROCESSOR_ARCHITECTURE'] = 'foo'
                     platform._uname_cache = None
                     system, node, release, version, machine, processor = platform.uname()
                     self.assertEqual(machine, 'foo')
+
                     environ['PROCESSOR_ARCHITEW6432'] = 'bar'
                     platform._uname_cache = None
                     system, node, release, version, machine, processor = platform.uname()
diff --git a/Misc/NEWS.d/next/Library/2026-03-19-00-32-12.gh-issue-145410.gu1Ops.rst b/Misc/NEWS.d/next/Library/2026-03-19-00-32-12.gh-issue-145410.gu1Ops.rst
@@ -0,0 +1,2 @@
+:mod:`platform`: On Windows, use the ``_sysconfig`` module to get the
+architecture and the machine. Patch by Victor Stinner.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:mod:`platform`: On Windows, use the ``_sysconfig`` module to get the
	`2`	`+architecture and the machine. Patch by Victor Stinner.`