mirror of
https://github.com/GAM-team/GAM.git
synced 2025-07-10 14:43:34 +00:00
Update getting MacOS version (#1409)
This commit is contained in:
@ -728,8 +728,12 @@ def getOSPlatform():
|
|||||||
elif myos == 'Darwin':
|
elif myos == 'Darwin':
|
||||||
myos = 'MacOS'
|
myos = 'MacOS'
|
||||||
mac_ver = platform.mac_ver()[0]
|
mac_ver = platform.mac_ver()[0]
|
||||||
|
major_ver = int(mac_ver.split('.')[0]) # macver 10.14.6 == major_ver 10
|
||||||
minor_ver = int(mac_ver.split('.')[1]) # macver 10.14.6 == minor_ver 14
|
minor_ver = int(mac_ver.split('.')[1]) # macver 10.14.6 == minor_ver 14
|
||||||
codename = MACOS_CODENAMES.get(minor_ver, '')
|
if major_ver == 10:
|
||||||
|
codename = MACOS_CODENAMES[major_ver].get(minor_ver, '')
|
||||||
|
else:
|
||||||
|
codename = MACOS_CODENAMES.get(major_ver, '')
|
||||||
pltfrm = ' '.join([codename, mac_ver])
|
pltfrm = ' '.join([codename, mac_ver])
|
||||||
else:
|
else:
|
||||||
pltfrm = platform.platform()
|
pltfrm = platform.platform()
|
||||||
|
@ -616,6 +616,7 @@ GOOGLEDOC_VALID_EXTENSIONS_MAP = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
MACOS_CODENAMES = {
|
MACOS_CODENAMES = {
|
||||||
|
10: {
|
||||||
6: 'Snow Leopard',
|
6: 'Snow Leopard',
|
||||||
7: 'Lion',
|
7: 'Lion',
|
||||||
8: 'Mountain Lion',
|
8: 'Mountain Lion',
|
||||||
@ -625,8 +626,11 @@ MACOS_CODENAMES = {
|
|||||||
12: 'Sierra',
|
12: 'Sierra',
|
||||||
13: 'High Sierra',
|
13: 'High Sierra',
|
||||||
14: 'Mojave',
|
14: 'Mojave',
|
||||||
15: 'Catalina'
|
15: 'Catalina',
|
||||||
}
|
16: 'Big Sur'
|
||||||
|
},
|
||||||
|
11: 'Big Sur',
|
||||||
|
}
|
||||||
|
|
||||||
_MICROSOFT_FORMATS_LIST = [{
|
_MICROSOFT_FORMATS_LIST = [{
|
||||||
'mime':
|
'mime':
|
||||||
|
Reference in New Issue
Block a user