diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-03-22 17:48:48 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-03-22 17:48:48 (GMT) |
| commit | ca2edce67695b73e21a64a352632feedc08ccf29 (patch) | |
| tree | 31a8b7165f119926996154cb3104e0a04544f713 /Lib/platform.py | |
| parent | 37c1f18a7224e00f61b2141420c24dc6f391abb9 (diff) | |
| download | cpython-ca2edce67695b73e21a64a352632feedc08ccf29.zip cpython-ca2edce67695b73e21a64a352632feedc08ccf29.tar.gz cpython-ca2edce67695b73e21a64a352632feedc08ccf29.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 7d39250..aa256dc 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) |