From 6ff97f7e21af3ab4287f77f73fd17e4a9baa03a3 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 7 Feb 2010 11:30:54 +0000 Subject: [PATCH] Merged revisions 78056 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78056 | ronald.oussoren | 2010-02-07 12:29:31 +0100 (Sun, 07 Feb 2010) | 5 lines Remove call to gestalt('sysu') from platform.py. This gestalt call is not available on OSX an appearently causes problems for some users. Fixes issue 7812 ........ --- Lib/platform.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py index 1852f30d0e..ea440d1349 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -720,7 +720,7 @@ def mac_ver(release='',versioninfo=('','',''),machine=''): except ImportError: return release,versioninfo,machine # Get the infos - sysv,sysu,sysa = _mac_ver_lookup(('sysv','sysu','sysa')) + sysv,sysa = _mac_ver_lookup(('sysv','sysa')) # Decode the infos if sysv: major = (sysv & 0xFF00) >> 8 @@ -738,24 +738,6 @@ def mac_ver(release='',versioninfo=('','',''),machine=''): else: release = '%s.%i.%i' % (_bcd2str(major),minor,patch) - if sysu: - # NOTE: this block is left as documentation of the - # intention of this function, the 'sysu' gestalt is no - # longer available and there are no alternatives. - major = int((sysu & 0xFF000000L) >> 24) - minor = (sysu & 0x00F00000) >> 20 - bugfix = (sysu & 0x000F0000) >> 16 - stage = (sysu & 0x0000FF00) >> 8 - nonrel = (sysu & 0x000000FF) - version = '%s.%i.%i' % (_bcd2str(major),minor,bugfix) - nonrel = _bcd2str(nonrel) - stage = {0x20:'development', - 0x40:'alpha', - 0x60:'beta', - 0x80:'final'}.get(stage,'') - versioninfo = (version,stage,nonrel) - - if sysa: machine = {0x1: '68k', 0x2: 'PowerPC', -- 2.40.0