changeset: 71316:0a53a978a160 branch: 2.7 parent: 71313:a9d0fab19d5e user: Ned Deily date: Wed Jul 13 15:05:31 2011 -0700 files: Doc/library/platform.rst Lib/platform.py Lib/test/test_platform.py Misc/NEWS description: 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. diff -r a9d0fab19d5e -r 0a53a978a160 Doc/library/platform.rst --- a/Doc/library/platform.rst Wed Jul 13 21:47:31 2011 +0200 +++ b/Doc/library/platform.rst Wed Jul 13 15:05:31 2011 -0700 @@ -233,9 +233,6 @@ Entries which cannot be determined are set to ``''``. All tuple entries are strings. - Documentation for the underlying :cfunc:`gestalt` API is available online at - http://www.rgaros.nl/gestalt/. - Unix Platforms -------------- diff -r a9d0fab19d5e -r 0a53a978a160 Lib/platform.py --- a/Lib/platform.py Wed Jul 13 21:47:31 2011 +0200 +++ b/Lib/platform.py Wed Jul 13 15:05:31 2011 -0700 @@ -765,6 +765,7 @@ 0x2: 'PowerPC', 0xa: 'i386'}.get(sysa,'') + versioninfo=('', '', '') return release,versioninfo,machine def _mac_ver_xml(): diff -r a9d0fab19d5e -r 0a53a978a160 Lib/test/test_platform.py --- a/Lib/test/test_platform.py Wed Jul 13 21:47:31 2011 +0200 +++ b/Lib/test/test_platform.py Wed Jul 13 15:05:31 2011 -0700 @@ -191,7 +191,7 @@ self.assertEqual(res[1], ('', '', '')) if sys.byteorder == 'little': - self.assertEqual(res[2], 'i386') + self.assertIn(res[2], ('i386', 'x86_64')) else: self.assertEqual(res[2], 'PowerPC') diff -r a9d0fab19d5e -r 0a53a978a160 Misc/NEWS --- a/Misc/NEWS Wed Jul 13 21:47:31 2011 +0200 +++ b/Misc/NEWS Wed Jul 13 15:05:31 2011 -0700 @@ -101,6 +101,9 @@ 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 failure in name resolution.