deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 14:43:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update getting MacOS version (#1409)

Browse Source
This commit is contained in:
Ross Scroggs
2021-08-14 13:59:07 -07:00
committed by GitHub
parent 1a9de867f9
commit 95beb8e62a
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam/__init__.py
View File

@ -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()

26
src/gam/var.py
View File

@ -616,17 +616,21 @@ GOOGLEDOC_VALID_EXTENSIONS_MAP = {
} }
MACOS_CODENAMES = { MACOS_CODENAMES = {
6: 'Snow Leopard', 10: {
7: 'Lion', 6: 'Snow Leopard',
8: 'Mountain Lion', 7: 'Lion',
9: 'Mavericks', 8: 'Mountain Lion',
10: 'Yosemite', 9: 'Mavericks',
11: 'El Capitan', 10: 'Yosemite',
12: 'Sierra', 11: 'El Capitan',
13: 'High Sierra', 12: 'Sierra',
14: 'Mojave', 13: 'High Sierra',
15: 'Catalina' 14: 'Mojave',
} 15: 'Catalina',
16: 'Big Sur'
},
11: 'Big Sur',
}
_MICROSOFT_FORMATS_LIST = [{ _MICROSOFT_FORMATS_LIST = [{
'mime': 'mime':