[Python-checkins] r79298 - in python/branches/py3k: Lib/platform.py Lib/test/test_platform.py Misc/NEWS
r.david.murray
python-checkins at python.org
Mon Mar 22 18:48:48 CET 2010
Author: r.david.murray
Date: Mon Mar 22 18:48:48 2010
New Revision: 79298
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/platform.py
python/branches/py3k/Lib/test/test_platform.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/platform.py
==============================================================================
--- python/branches/py3k/Lib/platform.py (original)
+++ python/branches/py3k/Lib/platform.py Mon Mar 22 18:48:48 2010
@@ -1103,7 +1103,11 @@
# 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)
Modified: python/branches/py3k/Lib/test/test_platform.py
==============================================================================
--- python/branches/py3k/Lib/test/test_platform.py (original)
+++ python/branches/py3k/Lib/test/test_platform.py Mon Mar 22 18:48:48 2010
@@ -127,6 +127,27 @@
res = platform.uname()
self.assertTrue(any(res))
+ @unittest.skipUnless(sys.platform.startswith('win'), "windows only test")
+ def test_uname_win32_ARCHITEW6432(self):
+ # Issue 7860: make sure we get architecture from the correct variable
+ # on 64 bit Windows: if PROCESSOR_ARCHITEW6432 exists we should be
+ # using it, per
+ # http://blogs.msdn.com/david.wang/archive/2006/03/26/HOWTO-Detect-Process-Bitness.aspx
+ try:
+ with test_support.EnvironmentVarGuard() as environ:
+ if 'PROCESSOR_ARCHITEW6432' in environ:
+ 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()
+ self.assertEqual(machine, 'bar')
+ finally:
+ platform._uname_cache = None
+
def test_java_ver(self):
res = platform.java_ver()
if sys.platform == 'java':
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Mar 22 18:48:48 2010
@@ -287,6 +287,9 @@
Library
-------
+- Issue #7860: platform.uname now reports the correct 'machine' type
+ when Python is running in WOW64 mode on 64 bit Windows.
+
- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
- Issue #4282: Fix the main function of the profile module for a non-ASCII
More information about the Python-checkins
mailing list