[Python-checkins] r78057 - in python/branches/release26-maint: Lib/platform.py

Sun Feb 7 12:30:54 CET 2010

Author: ronald.oussoren
Date: Sun Feb 7 12:30:54 2010
New Revision: 78057
Log:
Merged revisions 78056 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78056 | ronald.oussoren | 2010年02月07日 12:29:31 +0100 (2010年2月07日) | 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
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/platform.py
Modified: python/branches/release26-maint/Lib/platform.py
==============================================================================

--- python/branches/release26-maint/Lib/platform.py	(original)
+++ python/branches/release26-maint/Lib/platform.py	Sun Feb 7 12:30:54 2010
@@ -720,7 +720,7 @@
 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 @@
 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',
