From 96af812c071677f3394d876e1f77eb7798dd7538 Mon Sep 17 00:00:00 2001 From: Samuel T Date: Wed, 19 Oct 2022 10:21:19 -0400 Subject: [PATCH] pywin32: Remove IID that doesn't exist at runtime (#8930) Remove IID that doesn't exist at runtime --- stubs/pywin32/METADATA.toml | 2 ++ stubs/pywin32/win32comext/adsi/adsi.pyi | 1 - stubs/pywin32/win32comext/authorization/authorization.pyi | 1 - stubs/pywin32/win32comext/axcontrol/axcontrol.pyi | 1 - stubs/pywin32/win32comext/axdebug/axdebug.pyi | 1 - stubs/pywin32/win32comext/axscript/axscript.pyi | 1 - stubs/pywin32/win32comext/bits/bits.pyi | 1 - stubs/pywin32/win32comext/directsound/directsound.pyi | 1 - stubs/pywin32/win32comext/ifilter/ifilter.pyi | 1 - stubs/pywin32/win32comext/mapi/exchange.pyi | 1 - stubs/pywin32/win32comext/mapi/mapi.pyi | 1 - stubs/pywin32/win32comext/propsys/propsys.pyi | 1 - stubs/pywin32/win32comext/shell/shell.pyi | 1 - stubs/pywin32/win32comext/taskscheduler/taskscheduler.pyi | 1 - 14 files changed, 2 insertions(+), 13 deletions(-) diff --git a/stubs/pywin32/METADATA.toml b/stubs/pywin32/METADATA.toml index 6bbaddd0e..27656a45b 100644 --- a/stubs/pywin32/METADATA.toml +++ b/stubs/pywin32/METADATA.toml @@ -2,4 +2,6 @@ version = "304.*" [tool.stubtest] # The library only works on Windows; we currently only run stubtest on Ubuntu for third-party stubs in CI. # See #8660 +# `ignore_missing_stub = false` crashes stubtest. This should be fixed in next mypy update +# https://github.com/python/mypy/issues/13822 skip = true diff --git a/stubs/pywin32/win32comext/adsi/adsi.pyi b/stubs/pywin32/win32comext/adsi/adsi.pyi index c3ff8d1d5..4004c541d 100644 --- a/stubs/pywin32/win32comext/adsi/adsi.pyi +++ b/stubs/pywin32/win32comext/adsi/adsi.pyi @@ -2,7 +2,6 @@ from _typeshed import Incomplete from typing_extensions import TypeAlias import _win32typing -from pywintypes import IID as IID from win32.lib.pywintypes import com_error error: TypeAlias = com_error # noqa: Y042 diff --git a/stubs/pywin32/win32comext/authorization/authorization.pyi b/stubs/pywin32/win32comext/authorization/authorization.pyi index 98cc51ea5..0a9881848 100644 --- a/stubs/pywin32/win32comext/authorization/authorization.pyi +++ b/stubs/pywin32/win32comext/authorization/authorization.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID def EditSecurity(*args, **kwargs): ... # incomplete diff --git a/stubs/pywin32/win32comext/axcontrol/axcontrol.pyi b/stubs/pywin32/win32comext/axcontrol/axcontrol.pyi index 196ad6e92..c4f346bc8 100644 --- a/stubs/pywin32/win32comext/axcontrol/axcontrol.pyi +++ b/stubs/pywin32/win32comext/axcontrol/axcontrol.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID def OleCreate( clsid, diff --git a/stubs/pywin32/win32comext/axdebug/axdebug.pyi b/stubs/pywin32/win32comext/axdebug/axdebug.pyi index 3b589b258..2ecd3063a 100644 --- a/stubs/pywin32/win32comext/axdebug/axdebug.pyi +++ b/stubs/pywin32/win32comext/axdebug/axdebug.pyi @@ -2,7 +2,6 @@ # "ImportError: DLL load failed while importing axdebug: The specified module could not be found." # https://github.com/python/mypy/issues/13822 import _win32typing -from pywintypes import IID as IID APPBREAKFLAG_DEBUGGER_BLOCK: int APPBREAKFLAG_DEBUGGER_HALT: int diff --git a/stubs/pywin32/win32comext/axscript/axscript.pyi b/stubs/pywin32/win32comext/axscript/axscript.pyi index ff17decfa..8914786fa 100644 --- a/stubs/pywin32/win32comext/axscript/axscript.pyi +++ b/stubs/pywin32/win32comext/axscript/axscript.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID CATID_ActiveScript: _win32typing.PyIID CATID_ActiveScriptParse: _win32typing.PyIID diff --git a/stubs/pywin32/win32comext/bits/bits.pyi b/stubs/pywin32/win32comext/bits/bits.pyi index d28f8efb0..8bc0c0563 100644 --- a/stubs/pywin32/win32comext/bits/bits.pyi +++ b/stubs/pywin32/win32comext/bits/bits.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID BG_AUTH_SCHEME_BASIC: int BG_AUTH_SCHEME_DIGEST: int diff --git a/stubs/pywin32/win32comext/directsound/directsound.pyi b/stubs/pywin32/win32comext/directsound/directsound.pyi index 2c122b606..3fee30636 100644 --- a/stubs/pywin32/win32comext/directsound/directsound.pyi +++ b/stubs/pywin32/win32comext/directsound/directsound.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete import _win32typing -from pywintypes import IID as IID def DirectSoundCreate(guid: _win32typing.PyIID | None = ..., unk: Incomplete | None = ...) -> _win32typing.PyIUnknown: ... def DirectSoundEnumerate(): ... diff --git a/stubs/pywin32/win32comext/ifilter/ifilter.pyi b/stubs/pywin32/win32comext/ifilter/ifilter.pyi index e4a572c97..9d7a52077 100644 --- a/stubs/pywin32/win32comext/ifilter/ifilter.pyi +++ b/stubs/pywin32/win32comext/ifilter/ifilter.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID def BindIFilterFromStorage(*args, **kwargs): ... # incomplete def BindIFilterFromStream(*args, **kwargs): ... # incomplete diff --git a/stubs/pywin32/win32comext/mapi/exchange.pyi b/stubs/pywin32/win32comext/mapi/exchange.pyi index 90711331e..ac1a9741b 100644 --- a/stubs/pywin32/win32comext/mapi/exchange.pyi +++ b/stubs/pywin32/win32comext/mapi/exchange.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID OPENSTORE_HOME_LOGON: int OPENSTORE_OVERRIDE_HOME_MDB: int diff --git a/stubs/pywin32/win32comext/mapi/mapi.pyi b/stubs/pywin32/win32comext/mapi/mapi.pyi index 5b48e1efe..2eddb48b5 100644 --- a/stubs/pywin32/win32comext/mapi/mapi.pyi +++ b/stubs/pywin32/win32comext/mapi/mapi.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete import _win32typing -from pywintypes import IID as IID def HexFromBin(val: str) -> str: ... def BinFromHex(val: str) -> str: ... diff --git a/stubs/pywin32/win32comext/propsys/propsys.pyi b/stubs/pywin32/win32comext/propsys/propsys.pyi index 9e250f39b..851372545 100644 --- a/stubs/pywin32/win32comext/propsys/propsys.pyi +++ b/stubs/pywin32/win32comext/propsys/propsys.pyi @@ -1,7 +1,6 @@ from typing_extensions import TypeAlias import _win32typing -from pywintypes import IID as IID from win32.lib.pywintypes import com_error error: TypeAlias = com_error # noqa: Y042 diff --git a/stubs/pywin32/win32comext/shell/shell.pyi b/stubs/pywin32/win32comext/shell/shell.pyi index 7b06de0c3..35a077266 100644 --- a/stubs/pywin32/win32comext/shell/shell.pyi +++ b/stubs/pywin32/win32comext/shell/shell.pyi @@ -2,7 +2,6 @@ from _typeshed import Incomplete from typing_extensions import TypeAlias import _win32typing -from pywintypes import IID as IID from win32.lib.pywintypes import com_error error: TypeAlias = com_error # noqa: Y042 diff --git a/stubs/pywin32/win32comext/taskscheduler/taskscheduler.pyi b/stubs/pywin32/win32comext/taskscheduler/taskscheduler.pyi index e2503b89f..b37d72241 100644 --- a/stubs/pywin32/win32comext/taskscheduler/taskscheduler.pyi +++ b/stubs/pywin32/win32comext/taskscheduler/taskscheduler.pyi @@ -1,5 +1,4 @@ import _win32typing -from pywintypes import IID as IID CLSID_CTask: _win32typing.PyIID CLSID_CTaskScheduler: _win32typing.PyIID