diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 11:33:33 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-07 11:33:33 (GMT) |
| commit | 19258d5a352c375bbe0da4bb569e556671b9b04f (patch) | |
| tree | 9cf63baafa9f7f6875a7cb561b9d546fddd54429 /Lib/platform.py | |
| parent | 06b59e0c4bc73f9b1f988e0e26085126aa3b42e2 (diff) | |
| download | cpython-19258d5a352c375bbe0da4bb569e556671b9b04f.zip cpython-19258d5a352c375bbe0da4bb569e556671b9b04f.tar.gz cpython-19258d5a352c375bbe0da4bb569e556671b9b04f.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 570f327..b6e7596 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -729,7 +729,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 @@ -747,24 +747,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 & 0xFF000000) >> 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', |