From c0c3914b098bdc08abeee3403c8dc81f62384f13 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Thu, 8 May 2008 10:35:13 +0000 Subject: [PATCH] Backport of revision 62854 --- Lib/platform.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py index 2dcf5e13216..f34e7355923 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -591,7 +591,17 @@ def mac_ver(release='',versioninfo=('','',''),machine=''): major = (sysv & 0xFF00) >> 8 minor = (sysv & 0x00F0) >> 4 patch = (sysv & 0x000F) - release = '%s.%i.%i' % (_bcd2str(major),minor,patch) + + if (major, minor) >= (10, 4): + # the 'sysv' gestald cannot return patchlevels + # higher than 9. Apple introduced 3 new + # gestalt codes in 10.4 to deal with this + # issue (needed because patch levels can + # run higher than 9, such as 10.4.11) + major,minor,patch = _mac_ver_lookup(('sys1','sys2','sys3')) + release = '%i.%i.%i' %(major, minor, patch) + else: + release = '%s.%i.%i' % (_bcd2str(major),minor,patch) if sysu: major = int((sysu & 0xFF000000L) >> 24) minor = (sysu & 0x00F00000) >> 20