[Updated] D9722: setup: don't import distutils prior to checking FORCE_SETUPTOOLS

[Phabricator]

Closed by commit rHG172b294b6d65: setup: don't import distutils prior to checking FORCE_SETUPTOOLS (authored by Dan Villiom Podlaski Christiansen <danchr at gmail.com>).
This revision was automatically updated to reflect the committed changes.

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D9722?vs=24713&id=24792#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D9722?vs=24713&id=24792

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D9722/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D9722

AFFECTED FILES
  setup.py

CHANGE DETAILS

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -179,7 +179,6 @@
 import re
 import shutil
 import tempfile
-from distutils import log
 
 # We have issues with setuptools on some platforms and builders. Until
 # those are resolved, setuptools is opt-in except for platforms where
@@ -199,6 +198,7 @@
 from distutils.command.install import install
 from distutils.command.install_lib import install_lib
 from distutils.command.install_scripts import install_scripts
+from distutils import log
 from distutils.spawn import spawn, find_executable
 from distutils import file_util
 from distutils.errors import (



To: danchr, #hg-reviewers, Alphare, mharbison72
Cc: mharbison72, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210113/d135df25/attachment-0002.html>