Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64' 

as the processor type on some Mac systems.  Also fix NameError in fallback
_mac_ver_gestalt function.  And remove out-of-date URL in docs.
This commit is contained in:
Ned Deily 2011-07-13 15:05:31 -07:00
parent bf547fd3f2
commit 0ab67ee79e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/platform.rst
View File

@ -233,9 +233,6 @@ Mac OS Platform
Entries which cannot be determined are set to ``''``. All tuple entries are Entries which cannot be determined are set to ``''``. All tuple entries are
strings. strings.
Documentation for the underlying :cfunc:`gestalt` API is available online at
http://www.rgaros.nl/gestalt/.
Unix Platforms Unix Platforms
-------------- --------------

1
Lib/platform.py
View File

@ -765,6 +765,7 @@ def _mac_ver_gestalt():
0x2: 'PowerPC', 0x2: 'PowerPC',
0xa: 'i386'}.get(sysa,'') 0xa: 'i386'}.get(sysa,'')
versioninfo=('', '', '')
return release,versioninfo,machine return release,versioninfo,machine
def _mac_ver_xml(): def _mac_ver_xml():

2
Lib/test/test_platform.py
View File

@ -191,7 +191,7 @@ class PlatformTest(unittest.TestCase):
self.assertEqual(res[1], ('', '', '')) self.assertEqual(res[1], ('', '', ''))
if sys.byteorder == 'little': if sys.byteorder == 'little':
self.assertEqual(res[2], 'i386') self.assertIn(res[2], ('i386', 'x86_64'))
else: else:
self.assertEqual(res[2], 'PowerPC') self.assertEqual(res[2], 'PowerPC')

3
Misc/NEWS
View File

@ -101,6 +101,9 @@ Build
Tests Tests
----- -----
- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
as the processor type on some Mac systems.
- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary - Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
failure in name resolution. failure in name resolution.