From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 282B61382C5 for ; Sat, 5 Jun 2021 21:08:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79726E0950; Sat, 5 Jun 2021 21:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 602FBE0950 for ; Sat, 5 Jun 2021 21:08:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78B0A340ECD for ; Sat, 5 Jun 2021 21:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 107AF799 for ; Sat, 5 Jun 2021 21:08:55 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1622926500.08d28ce963be6617f4aeed3a74c5e9e7cf977156.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 08d28ce963be6617f4aeed3a74c5e9e7cf977156 X-VCS-Branch: master Date: Sat, 5 Jun 2021 21:08:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf99a751-513e-489b-b3b4-c874f8a58968 X-Archives-Hash: 66b57a192c50a36a01274ef1e2676917 commit: 08d28ce963be6617f4aeed3a74c5e9e7cf977156 Author: Zac Medico gentoo org> AuthorDate: Sat Jun 5 20:37:00 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 5 20:55:00 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=08d28ce9 setup.py: prefer setuptools over distutils (bug 794166) Bug: https://bugs.gentoo.org/794166 Signed-off-by: Zac Medico gentoo.org> setup.py | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index f9609d058..0ebdcbb4f 100755 --- a/setup.py +++ b/setup.py @@ -2,19 +2,34 @@ # Copyright 1998-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from distutils.core import setup, Command, Extension -from distutils.command.build import build -from distutils.command.build_ext import build_ext as _build_ext -from distutils.command.build_scripts import build_scripts -from distutils.command.clean import clean -from distutils.command.install import install -from distutils.command.install_data import install_data -from distutils.command.install_lib import install_lib -from distutils.command.install_scripts import install_scripts -from distutils.command.sdist import sdist -from distutils.dep_util import newer -from distutils.dir_util import mkpath, remove_tree -from distutils.util import change_root, subst_vars +try: + from setuptools.core import setup, Command, Extension + from setuptools.command.build import build + from setuptools.command.build_ext import build_ext as _build_ext + from setuptools.command.build_scripts import build_scripts + from setuptools.command.clean import clean + from setuptools.command.install import install + from setuptools.command.install_data import install_data + from setuptools.command.install_lib import install_lib + from setuptools.command.install_scripts import install_scripts + from setuptools.command.sdist import sdist + from setuptools.dep_util import newer + from setuptools.dir_util import mkpath, remove_tree + from setuptools.util import change_root, subst_vars +except ImportError: + from distutils.core import setup, Command, Extension + from distutils.command.build import build + from distutils.command.build_ext import build_ext as _build_ext + from distutils.command.build_scripts import build_scripts + from distutils.command.clean import clean + from distutils.command.install import install + from distutils.command.install_data import install_data + from distutils.command.install_lib import install_lib + from distutils.command.install_scripts import install_scripts + from distutils.command.sdist import sdist + from distutils.dep_util import newer + from distutils.dir_util import mkpath, remove_tree + from distutils.util import change_root, subst_vars import codecs import collections