From f3bcaf9f88aad2c423ebcd61121562f9834187d4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 17:11:27 +0200 Subject: Merging upstream version 115.8.0esr. Signed-off-by: Daniel Baumann --- tools/power/mach_commands.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/power') diff --git a/tools/power/mach_commands.py b/tools/power/mach_commands.py index 956dcdf440..117a96e1c7 100644 --- a/tools/power/mach_commands.py +++ b/tools/power/mach_commands.py @@ -2,16 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -from distutils.version import StrictVersion - from mach.decorators import Command, CommandArgument +from packaging.version import Version def is_osx_10_10_or_greater(cls): import platform release = platform.mac_ver()[0] - return release and StrictVersion(release) >= StrictVersion("10.10") + return release and Version(release) >= Version("10.10") # Get system power consumption and related measurements. -- cgit v1.2.3