From 89eb6c797be176a173fbe7c55e130345e15ec889 Mon Sep 17 00:00:00 2001 From: ahochheiden Date: Thu, 8 Feb 2024 21:07:27 +0000 Subject: [PATCH] Bug 1877348 - Remove the `try/except` wrappers that end up calling `distutils.core.setup` r=firefox-build-system-reviewers,glandium This is one of the last references to `distutils` within `mach`, so let's get rid of it to be thorough. Differential Revision: https://phabricator.services.mozilla.com/D199951 --- python/mach/setup.py | 6 +----- python/mozboot/setup.py | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/python/mach/setup.py b/python/mach/setup.py index 80426b6e00fc..a89f0a600978 100644 --- a/python/mach/setup.py +++ b/python/mach/setup.py @@ -4,11 +4,7 @@ import os -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - +from setuptools import setup VERSION = "1.0.0" HERE = os.path.dirname(__file__) diff --git a/python/mozboot/setup.py b/python/mozboot/setup.py index 7b12c1c0c5d8..0b742852bd81 100644 --- a/python/mozboot/setup.py +++ b/python/mozboot/setup.py @@ -2,10 +2,7 @@ # 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/. -try: - from setuptools import setup -except ImportError: - from distutils.core import setup +from setuptools import setup VERSION = "0.1"