From ca2edce67695b73e21a64a352632feedc08ccf29 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Mon, 22 Mar 2010 17:48:48 +0000 Subject: Merged revisions 79294 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79294 | r.david.murray | 2010-03-22 11:55:09 -0400 (Mon, 22 Mar 2010) | 4 lines Issue #7860: platform.uname now reports the correct 'machine' type when Python is running in WOW64 mode on 64 bit Windows. Patch by Brian Curtin. ........ --- Lib/platform.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Lib/platform.py') diff --git a/Lib/platform.py b/Lib/platform.py index 7d392502a1..aa256dca92 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1103,7 +1103,11 @@ def uname(): # http://support.microsoft.com/kb/888731 and # http://www.geocities.com/rick_lively/MANUALS/ENV/MSWIN/PROCESSI.HTM if not machine: - machine = os.environ.get('PROCESSOR_ARCHITECTURE', '') + # WOW64 processes mask the native architecture + if "PROCESSOR_ARCHITEW6432" in os.environ: + machine = os.environ.get("PROCESSOR_ARCHITEW6432", '') + else: + machine = os.environ.get('PROCESSOR_ARCHITECTURE', '') if not processor: processor = os.environ.get('PROCESSOR_IDENTIFIER', machine) -- cgit v1.2.1