Merge branch 'main' into re-enable-mypy

Author: Avasam

distutils/_msvccompiler.py

@@ -1,5 +1,16 @@
+import warnings
+
 from .compilers.C import msvc
 
 __all__ = ["MSVCCompiler"]
 
 MSVCCompiler = msvc.Compiler
+
+
+def __getattr__(name):
+    if name == '_get_vc_env':
+        warnings.warn(
+            "_get_vc_env is private; find an alternative (pypa/distutils#340)"
+        )
+        return msvc._get_vc_env
+    raise AttributeError(name)

distutils/command/__init__.py

@@ -3,40 +3,21 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
-from . import (
-    bdist,
-    bdist_dumb,
-    bdist_rpm,
-    build,
-    build_clib,
-    build_ext,
-    build_py,
-    build_scripts,
-    check,
-    clean,
-    install,
-    install_data,
-    install_headers,
-    install_lib,
-    install_scripts,
-    sdist,
-)
-
 __all__ = [
-    'bdist',
-    'bdist_dumb',
-    'bdist_rpm',
     'build',
-    'build_clib',
-    'build_ext',
     'build_py',
+    'build_ext',
+    'build_clib',
     'build_scripts',
-    'check',
     'clean',
     'install',
-    'install_data',
-    'install_headers',
     'install_lib',
+    'install_headers',
     'install_scripts',
+    'install_data',
     'sdist',
+    'bdist',
+    'bdist_dumb',
+    'bdist_rpm',
+    'check',
 ]

newsfragments/4874.feature.rst

@@ -0,0 +1 @@
+Restore access to _get_vc_env with a warning.