summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-11-26 13:42:18 -0500
committerJason R. Coombs <jaraco@jaraco.com>2021-11-26 14:09:38 -0500
commit34defd4d420e31e7c4cefe3e44145c6fe8b41eca (patch)
treef35d1b85955ce8372e1ddfa1f7a076ffa14be206
parent485fa84d85da3ab6892a9e591b111fbb094c1c9a (diff)
downloadpython-setuptools-git-34defd4d420e31e7c4cefe3e44145c6fe8b41eca.tar.gz
Bind to 'distutils.log' late in case the loader has changed.
-rw-r--r--_distutils_hack/__init__.py2
-rw-r--r--setuptools/tests/test_test.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index bcac4111..f7074162 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -49,7 +49,7 @@ def enabled():
def ensure_local_distutils():
clear_distutils()
- # ensure the DistutilsMetaFinder is in place and
+ # With the DistutilsMetaFinder in place,
# perform an import to cause distutils to be
# loaded from setuptools._distutils. Ref #2906.
add_shim()
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 2d8a7c5d..08d1329f 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,5 +1,3 @@
-from distutils import log
-
import pytest
from jaraco import path
@@ -13,7 +11,8 @@ from .textwrap import DALS
def quiet_log():
# Running some of the other tests will automatically
# change the log level to info, messing our output.
- log.set_verbosity(0)
+ import distutils.log
+ distutils.log.set_verbosity(0)
@pytest.mark.usefixtures('tmpdir_cwd', 'quiet_log')