diff options
author | Paul Ganssle <paul@ganssle.io> | 2020-07-13 12:02:41 -0400 |
---|---|---|
committer | Paul Ganssle <paul@ganssle.io> | 2020-07-13 15:42:23 -0400 |
commit | 03b36b5dc594bbe239d0ad66dc43ea7d1832072c (patch) | |
tree | 8c1aa0ed0944ccdfed9ed9c2bf55adbce4392cb2 /setuptools | |
parent | 28e1b5ab2f4d573a91705cdbb025e57023d264b1 (diff) | |
download | external_python_setuptools-03b36b5dc594bbe239d0ad66dc43ea7d1832072c.tar.gz external_python_setuptools-03b36b5dc594bbe239d0ad66dc43ea7d1832072c.tar.bz2 external_python_setuptools-03b36b5dc594bbe239d0ad66dc43ea7d1832072c.zip |
Remove warnings
With the new `.pth` file, these warnings are no longer necessary.
Diffstat (limited to 'setuptools')
-rw-r--r-- | setuptools/distutils_patch.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py index 33f1e7f9..d01a1a1b 100644 --- a/setuptools/distutils_patch.py +++ b/setuptools/distutils_patch.py @@ -12,26 +12,10 @@ import importlib 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] @@ -56,6 +40,5 @@ def ensure_local_distutils(): assert '_distutils' in core.__file__, core.__file__ -warn_distutils_present() if enabled(): ensure_local_distutils() |