Kaydet (Commit) 9341ad22 authored tarafından Ronald Oussoren's avatar Ronald Oussoren

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
üst 657514a6
......@@ -733,7 +733,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
......@@ -751,24 +751,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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment