Skip to content

Commit

Permalink
Remove warnings
Browse files Browse the repository at this point in the history
With the new `.pth` file, these warnings are no longer necessary.
  • Loading branch information
pganssle committed Jul 13, 2020
1 parent 95184dc commit 30b883f
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions setuptools/distutils_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,10 @@
import warnings


is_pypy = '__pypy__' in sys.builtin_module_names


def warn_distutils_present():
if 'distutils' not in sys.modules:
return
if is_pypy and sys.version_info < (3, 7):
# PyPy for 3.6 unconditionally imports distutils, so bypass the warning
# https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
return
warnings.warn(
"Distutils was imported before Setuptools. This usage is discouraged "
"and may exhibit undesirable behaviors or errors. Please use "
"Setuptools' objects directly or at least import Setuptools first.")


def clear_distutils():
if 'distutils' not in sys.modules:
return
warnings.warn("Setuptools is replacing distutils.")

mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
for name in mods:
del sys.modules[name]
Expand All @@ -56,6 +40,5 @@ def ensure_local_distutils():
assert '_distutils' in core.__file__, core.__file__


warn_distutils_present()
if enabled():
ensure_local_distutils()

0 comments on commit 30b883f

Please sign in to comment.