diff --git a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt index f091f0d03..d27bb8db7 100644 --- a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt +++ b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt @@ -1,9 +1,5 @@ # Not available at runtime. Contains type definitions that are otherwise not exposed _win32typing -# The exchdapi hasn't been built in years https://github.com/mhammond/pywin32/pull/2374 -win32com(ext)?.mapi._exchdapi -# Internal variable for deprecation message https://github.com/mhammond/pywin32/pull/2380 -win32com.server.dispatcher.DispatcherWin32dbg_deprecation_message # PyWin tool / debugger pythonwin.start_pythonwin @@ -51,10 +47,6 @@ win32com(ext)?.directsound.test.* # It's safer to not even expose this method as deprecated. (win32.)?win32gui.PyMakeBuffer -# failed to import, ImportError: circular import https://github.com/mhammond/pywin32/pull/2381 -win32com.axscript.client.error -win32com.axscript.client.framework - # Axdebug is not built on Python 3.11 anyway: https://github.com/mhammond/pywin32/blob/main/setup.py#L398-L402 # # failed to import, ImportError: DLL load failed while importing axdebug: The specified module could not be found. @@ -71,5 +63,3 @@ win32com(ext)?.axdebug.stackframe # failed to import, ImportError: cannot import name 'axdebug' from 'win32com.axdebug' win32com(ext)?.axdebug.gateways win32com(ext)?.axscript.client.debug -win32com(ext)?.axscript.client.error -win32com(ext)?.axscript.client.framework diff --git a/stubs/pywin32/METADATA.toml b/stubs/pywin32/METADATA.toml index 1c4dc9a65..b3bb0bad8 100644 --- a/stubs/pywin32/METADATA.toml +++ b/stubs/pywin32/METADATA.toml @@ -1,4 +1,4 @@ -version = "307.*" +version = "308.*" upstream_repository = "https://github.com/mhammond/pywin32" [tool.stubtest] diff --git a/stubs/pywin32/win32/lib/win32verstamp.pyi b/stubs/pywin32/win32/lib/win32verstamp.pyi new file mode 100644 index 000000000..cac01f847 --- /dev/null +++ b/stubs/pywin32/win32/lib/win32verstamp.pyi @@ -0,0 +1,21 @@ +from typing import Final + +VS_FFI_SIGNATURE: Final = -17890115 +VS_FFI_STRUCVERSION: Final = 0x00010000 +VS_FFI_FILEFLAGSMASK: Final = 0x0000003F +VOS_NT_WINDOWS32: Final = 0x00040004 +null_byte: Final = b"\0" + +def file_flags(debug): ... +def file_type(is_dll): ... +def VS_FIXEDFILEINFO(maj, min, sub, build, debug: int = 0, is_dll: int = 1): ... +def nullterm(s): ... +def pad32(s, extra: int = 2): ... +def addlen(s): ... +def String(key, value): ... +def StringTable(key, data): ... +def StringFileInfo(data): ... +def Var(key, value): ... +def VarFileInfo(data): ... +def VS_VERSION_INFO(maj, min, sub, build, sdata, vdata, debug: int = 0, is_dll: int = 1): ... +def stamp(pathname, options) -> None: ... diff --git a/stubs/pywin32/win32com/mapi/_exchdapi.pyi b/stubs/pywin32/win32com/mapi/_exchdapi.pyi deleted file mode 100644 index fe5f8ed0f..000000000 --- a/stubs/pywin32/win32com/mapi/_exchdapi.pyi +++ /dev/null @@ -1 +0,0 @@ -from win32comext.mapi._exchdapi import * diff --git a/stubs/pywin32/win32com/server/dispatcher.pyi b/stubs/pywin32/win32com/server/dispatcher.pyi index a43da7595..2644262ed 100644 --- a/stubs/pywin32/win32com/server/dispatcher.pyi +++ b/stubs/pywin32/win32com/server/dispatcher.pyi @@ -1,9 +1,11 @@ -from _typeshed import Incomplete -from typing_extensions import TypeAlias, deprecated +from logging import Logger +from typing_extensions import TypeAlias + +from win32com.server.policy import BasicWrapPolicy class DispatcherBase: - policy: Incomplete - logger: Incomplete + policy: BasicWrapPolicy + logger: Logger def __init__(self, policyClass, object) -> None: ... class DispatcherTrace(DispatcherBase): ... @@ -13,13 +15,4 @@ class DispatcherWin32trace(DispatcherTrace): class DispatcherOutputDebugString(DispatcherTrace): ... -@deprecated( - """\ -The DispatcherWin32dbg dispatcher is deprecated! -Please let the developer know if this is a problem. -Uncomment the relevant lines in dispatcher.py to re-enable""" -) -class DispatcherWin32dbg(DispatcherBase): - def __init__(self, policyClass, ob) -> None: ... - DefaultDebugDispatcher: TypeAlias = DispatcherTrace diff --git a/stubs/pywin32/win32comext/mapi/_exchdapi.pyi b/stubs/pywin32/win32comext/mapi/_exchdapi.pyi deleted file mode 100644 index a0e9d1e44..000000000 --- a/stubs/pywin32/win32comext/mapi/_exchdapi.pyi +++ /dev/null @@ -1,43 +0,0 @@ -from _typeshed import Incomplete - -import _win32typing - -def HrInstallService() -> None: ... -def HrInstallMailboxAgent() -> None: ... -def HrCreateMailboxAgentProfile(serviceName: str, profile: str, /) -> None: ... -def HrCreateGatewayProfile(serviceName: str, profile: str, /) -> None: ... -def HrMailboxAgentExists(server: str, siteDN: str, rdn: str, /) -> None: ... -def HrAdminProgramExists() -> None: ... -def HrRemoveMailboxAgent(server: str, siteDN: str, rdn: str, /) -> None: ... -def HrRemoveProfile(profile: str, /) -> None: ... -def HrEnumOrganizations(rootDN: str, server: str, /) -> list[str]: ... -def HrEnumSites(server: str, organizationDN: str, /) -> list[str]: ... -def HrEnumContainers(server: str, siteDN: str, fSubtree, /) -> list[str]: ... -def HrEnumSiteAdmins(server: str, siteDN: str, /) -> list[str]: ... -def HrGetServiceAccountName(serviceName: str, serviceName1: str, /) -> str: ... -def HrCreateDirEntryIdEx(addrBook: _win32typing.PyIAddrBook, distinguishedName: str, /) -> str: ... -def HrCreateProfileName(profPrefix: str, /) -> str: ... -def HrFindExchangeGlobalAddresslist(addrBook: _win32typing.PyIAddrBook, /) -> str: ... -def HrGetExchangeStatus(server: str, /) -> tuple[Incomplete, Incomplete]: ... -def HrGetMailboxDN(session, /) -> str: ... -def HrGetServerDN(session, /) -> str: ... -def HrMAPIFindDefaultMsgStore(session: _win32typing.PyIMAPISession, /) -> str: ... -def HrMAPIFindFolder(folder: _win32typing.PyIMAPIFolder, name: str, /) -> str: ... -def HrMAPIFindFolderEx(msgStore: _win32typing.PyIMsgStore, sepString: str, path: str, /) -> str: ... -def HrMAPIFindIPMSubtree(msgStore: _win32typing.PyIMsgStore, /) -> str: ... -def HrMAPIFindInbox(msgStore: _win32typing.PyIMsgStore, /) -> str: ... -def HrMAPIFindStore(session: _win32typing.PyIMAPISession, name: str, /) -> _win32typing.PyIMsgStore: ... -def HrMAPIFindSubfolderEx(rootFolder: _win32typing.PyIMAPIFolder, sep: str, name: str, /) -> _win32typing.PyIMsgStore: ... -def HrMAPIOpenFolderEx(msgStore: _win32typing.PyIMsgStore, sep: str, name: str, /) -> _win32typing.PyIMAPIFolder: ... -def HrMAPISetPropBoolean(obj: _win32typing.PyIMAPIProp, tag, /) -> None: ... -def HrMAPISetPropLong(obj: _win32typing.PyIMAPIProp, tag, /) -> None: ... -def HrMailboxLogoff(inbox: _win32typing.PyIMsgStore, /) -> None: ... -def HrMailboxLogon( - session: _win32typing.PyIMAPISession, msgStore: _win32typing.PyIMsgStore, msgStoreDN: str, mailboxDN: str, / -) -> _win32typing.PyIMsgStore: ... -def HrOpenExchangePrivateStore(session: _win32typing.PyIMAPISession, /) -> _win32typing.PyIMsgStore: ... -def HrOpenExchangePublicFolders(store: _win32typing.PyIMsgStore, /) -> _win32typing.PyIMAPIFolder: ... -def HrOpenExchangePublicStore(session: _win32typing.PyIMAPISession, /) -> _win32typing.PyIMsgStore: ... -def HrOpenSessionObject(session: _win32typing.PyIMAPISession, /) -> _win32typing.PyIMAPIProp: ... -def HrOpenSiteContainer(session: _win32typing.PyIMAPISession, /) -> _win32typing.PyIMAPIProp: ... -def HrOpenSiteContainerAddressing(session: _win32typing.PyIMAPISession, /) -> _win32typing.PyIMAPIProp: ... diff --git a/stubs/pywin32/win32verstamp.pyi b/stubs/pywin32/win32verstamp.pyi new file mode 100644 index 000000000..a1f2de1e1 --- /dev/null +++ b/stubs/pywin32/win32verstamp.pyi @@ -0,0 +1 @@ +from win32.lib.win32verstamp import *