X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaComposant%2FdaCore%2FPlatformInfo.py;h=3a01d6a268852e56de7d0328693dde2c6b368313;hb=61f19963a2e2ed620bdf577c5a01808586dd938d;hp=533e729ee408a06a6097c4d141801152d0aaf72d;hpb=c761e79a0ca835b448c19ec706f597ad21b67a03;p=modules%2Fadao.git diff --git a/src/daComposant/daCore/PlatformInfo.py b/src/daComposant/daCore/PlatformInfo.py index 533e729..3a01d6a 100644 --- a/src/daComposant/daCore/PlatformInfo.py +++ b/src/daComposant/daCore/PlatformInfo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2008-2021 EDF R&D +# Copyright (C) 2008-2022 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -98,13 +98,18 @@ class PlatformInfo(object): __msg += "\n%s%30s : %s" %(__prefix,"platform.dist",str(platform.dist())) elif sys.platform.startswith('darwin'): if hasattr(platform, 'mac_ver'): - __macosxv = {'5': 'Leopard', '6': 'Snow Leopard', '7': 'Lion', - '8': 'Mountain Lion', '9': 'Mavericks', '10': 'Yosemite', - '11': 'El Capitan', '12': 'Sierra'} + __macosxv = { + '0': 'Cheetah', '1': 'Puma', '2': 'Jaguar', + '3': 'Panther', '4': 'Tiger', '5': 'Leopard', + '6': 'Snow Leopard', '7': 'Lion', '8': 'Mountain Lion', + '9': 'Mavericks', '10': 'Yosemite', '11': 'El Capitan', + '12': 'Sierra', '13': 'High Sierra', '14': 'Mojave', + '15': 'Catalina', '16': 'Big Sur', '17': 'Monterey', + } for key in __macosxv: if (platform.mac_ver()[0].split('.')[1] == key): __msg += "\n%s%30s : %s" %(__prefix, - "platform.mac_ver",str(platform.mac_ver()[0]+"(" + macosx_dict[key]+")")) + "platform.mac_ver",str(platform.mac_ver()[0]+"(" + __macosxv[key]+")")) elif hasattr(platform, 'dist'): __msg += "\n%s%30s : %s" %(__prefix,"platform.dist",str(platform.dist())) elif os.name == 'nt':