From d94ca14aa3fa364f19b50e95fd7240c174847a35 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Mon, 17 Apr 2023 19:38:11 +0200 Subject: [PATCH 1/2] Readd C compiler errors in `setuptools.errors` --- stubs/setuptools/setuptools/errors.pyi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stubs/setuptools/setuptools/errors.pyi b/stubs/setuptools/setuptools/errors.pyi index 2e31b89c8bf8..5d055e62e848 100644 --- a/stubs/setuptools/setuptools/errors.pyi +++ b/stubs/setuptools/setuptools/errors.pyi @@ -1,3 +1,9 @@ from ._distutils.errors import DistutilsError class RemovedCommandError(DistutilsError, RuntimeError): ... +class CCompilerError(Exception): ... +class PreprocessError(CCompilerError): ... +class CompileError(CCompilerError): ... +class LibError(CCompilerError): ... +class LinkError(CCompilerError): ... +class UnknownFileError(CCompilerError): ... From 56d4a270b1d02751ac871c1ee9c3b3062814cc80 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Mon, 17 Apr 2023 13:04:17 -0600 Subject: [PATCH 2/2] A solution that's more faithful to the runtime --- .../setuptools/_distutils/errors.pyi | 18 ++++++++++++ stubs/setuptools/setuptools/errors.pyi | 29 ++++++++++++++----- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/stubs/setuptools/setuptools/_distutils/errors.pyi b/stubs/setuptools/setuptools/_distutils/errors.pyi index d19ac8b04eaa..e483362bfbf1 100644 --- a/stubs/setuptools/setuptools/_distutils/errors.pyi +++ b/stubs/setuptools/setuptools/_distutils/errors.pyi @@ -1 +1,19 @@ class DistutilsError(Exception): ... +class DistutilsModuleError(DistutilsError): ... +class DistutilsClassError(DistutilsError): ... +class DistutilsGetoptError(DistutilsError): ... +class DistutilsArgError(DistutilsError): ... +class DistutilsFileError(DistutilsError): ... +class DistutilsOptionError(DistutilsError): ... +class DistutilsSetupError(DistutilsError): ... +class DistutilsPlatformError(DistutilsError): ... +class DistutilsExecError(DistutilsError): ... +class DistutilsInternalError(DistutilsError): ... +class DistutilsTemplateError(DistutilsError): ... +class DistutilsByteCompileError(DistutilsError): ... +class CCompilerError(Exception): ... +class PreprocessError(CCompilerError): ... +class CompileError(CCompilerError): ... +class LibError(CCompilerError): ... +class LinkError(CCompilerError): ... +class UnknownFileError(CCompilerError): ... diff --git a/stubs/setuptools/setuptools/errors.pyi b/stubs/setuptools/setuptools/errors.pyi index 5d055e62e848..003874563c7c 100644 --- a/stubs/setuptools/setuptools/errors.pyi +++ b/stubs/setuptools/setuptools/errors.pyi @@ -1,9 +1,22 @@ -from ._distutils.errors import DistutilsError +from ._distutils import errors as _distutils_errors -class RemovedCommandError(DistutilsError, RuntimeError): ... -class CCompilerError(Exception): ... -class PreprocessError(CCompilerError): ... -class CompileError(CCompilerError): ... -class LibError(CCompilerError): ... -class LinkError(CCompilerError): ... -class UnknownFileError(CCompilerError): ... +ByteCompileError = _distutils_errors.DistutilsByteCompileError +CCompilerError = _distutils_errors.CCompilerError +ClassError = _distutils_errors.DistutilsClassError +CompileError = _distutils_errors.CompileError +ExecError = _distutils_errors.DistutilsExecError +FileError = _distutils_errors.DistutilsFileError +InternalError = _distutils_errors.DistutilsInternalError +LibError = _distutils_errors.LibError +LinkError = _distutils_errors.LinkError +ModuleError = _distutils_errors.DistutilsModuleError +OptionError = _distutils_errors.DistutilsOptionError +PlatformError = _distutils_errors.DistutilsPlatformError +PreprocessError = _distutils_errors.PreprocessError +SetupError = _distutils_errors.DistutilsSetupError +TemplateError = _distutils_errors.DistutilsTemplateError +UnknownFileError = _distutils_errors.UnknownFileError +BaseError = _distutils_errors.DistutilsError + +class RemovedCommandError(BaseError, RuntimeError): ... +class PackageDiscoveryError(BaseError, RuntimeError): ...