From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 7 Feb 2010 11:34:48 +0000 (+0000)
Subject: Merged revisions 78058 via svnmerge from
X-Git-Tag: v3.1.2rc1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e61b21e3ef2ebefeae3bcbc6b9b3dfb32dcbebc0;p=python

Merged revisions 78058 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78058 | ronald.oussoren | 2010-02-07 12:33:33 +0100 (Sun, 07 Feb 2010) | 12 lines

  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
  ........
................
---

diff --git a/Lib/platform.py b/Lib/platform.py
index d5100a86c2..b525695cb9 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -698,7 +698,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
@@ -716,24 +716,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',