summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-07-12 10:56:14 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-07-12 10:56:14 -0400
commit9e58d95017656ee33d2cf642cf1be6c77298f16d (patch)
tree9e3264d55c8eccf11a400ad40ecef0cd461b40b1
parent9e16d5399bb6b01aa0d7a73159765f064f88db22 (diff)
downloadpython-setuptools-git-9e58d95017656ee33d2cf642cf1be6c77298f16d.tar.gz
Re-enable distutils patch by default.
-rw-r--r--changelog.d/2232.breaking.rst1
-rw-r--r--setuptools/distutils_patch.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/2232.breaking.rst b/changelog.d/2232.breaking.rst
new file mode 100644
index 00000000..b2fd926f
--- /dev/null
+++ b/changelog.d/2232.breaking.rst
@@ -0,0 +1 @@
+Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index c5f273dd..e6b2aad5 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -25,7 +25,7 @@ def enabled():
"""
Allow selection of distutils by environment variable.
"""
- which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
+ which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local')
return which == 'local'