diff --git a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt index 434db4abcb5a..4ca47866f755 100644 --- a/stubs/pywin32/@tests/stubtest_allowlist_win32.txt +++ b/stubs/pywin32/@tests/stubtest_allowlist_win32.txt @@ -1,6 +1,9 @@ # Not available at runtime. Contains type definitions that are otherwise not exposed _win32typing +# False-positive, stubtest shouldn't want to expose TYPE_CHECKING +(win32\.lib\.)?pywintypes\.TYPE_CHECKING + # PyWin tool / debugger pythonwin.start_pythonwin pythonwin.pywin.* @@ -28,9 +31,7 @@ win32com(ext)?.axscript.client.scriptdispatch win32com.demos.* win32com.servers.test_pycomtest win32com.test.* -win32com(ext)?.axdebug.codecontainer win32com(ext)?.axdebug.dump -win32com(ext)?.axdebug.debugger win32com(ext)?.axscript.client.pydumper win32com(ext)?.directsound.test.* @@ -38,19 +39,13 @@ win32com(ext)?.directsound.test.* # It's safer to not even expose this method as deprecated. (win32.)?win32gui.PyMakeBuffer -# Axdebug is not built on Python 3.11 anyway: https://github.com/mhammond/pywin32/blob/c0f06cf49252b4848d0c74832247280291b00b03/setup.py#L386-L390 -# # failed to import, ImportError: DLL load failed while importing axdebug: The specified module could not be found. +win32com(ext)?.axdebug.adb win32com(ext)?.axdebug.axdebug win32com(ext)?.axdebug.codecontainer -# failed to import, ModuleNotFoundError: No module named 'gateways' win32com(ext)?.axdebug.contexts -# failed to import, ModuleNotFoundError: No module named 'axdebug' -win32com(ext)?.axdebug.adb +win32com(ext)?.axdebug.debugger win32com(ext)?.axdebug.documents win32com(ext)?.axdebug.expressions -# failed to import, ModuleNotFoundError: No module named 'expressions' -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)?.axdebug.stackframe diff --git a/stubs/pywin32/METADATA.toml b/stubs/pywin32/METADATA.toml index 6dbaac600ca5..05ca769e62be 100644 --- a/stubs/pywin32/METADATA.toml +++ b/stubs/pywin32/METADATA.toml @@ -1,4 +1,4 @@ -version = "311.*" +version = "312.*" upstream-repository = "https://github.com/mhammond/pywin32" [tool.stubtest] diff --git a/stubs/pywin32/_win32typing.pyi b/stubs/pywin32/_win32typing.pyi index 54ed57dacaad..7674f7b3586d 100644 --- a/stubs/pywin32/_win32typing.pyi +++ b/stubs/pywin32/_win32typing.pyi @@ -6312,3 +6312,14 @@ class HTTP_FILTER_VERSION: def Flags(self): ... @property def FilterDesc(self) -> str: ... + +class PySYSTEM_CPU_SET_INFORMATION: + Id: int + Group: int + LogicalProcessorIndex: int + CoreIndex: int + LastLevelCacheIndex: int + NumaNodeIndex: int + EfficiencyClass: int + SchedulingClass: int + AllocationTag: int diff --git a/stubs/pywin32/pythoncom.pyi b/stubs/pywin32/pythoncom.pyi index 3ab9e851e98f..83404871ff7a 100644 --- a/stubs/pywin32/pythoncom.pyi +++ b/stubs/pywin32/pythoncom.pyi @@ -496,4 +496,5 @@ fdexPropCannotPutRef: int fdexPropCannotSourceEvents: int fdexPropDynamicType: int fdexPropNoSideEffects: int +# Deprecated: Use `getattr(sys, "frozen", False)` directly instead. frozen: int diff --git a/stubs/pywin32/pythonwin/win32ui.pyi b/stubs/pywin32/pythonwin/win32ui.pyi index ea569a8dc85b..1ffdd84c6f21 100644 --- a/stubs/pywin32/pythonwin/win32ui.pyi +++ b/stubs/pywin32/pythonwin/win32ui.pyi @@ -368,7 +368,6 @@ IDC_TABTIMMY_NONE: int IDC_VIEW_EOL: int IDC_VIEW_INDENTATIONGUIDES: int ID_VIEW_FOLD_TOPLEVEL: int -UNICODE: int copyright: str dllhandle: int types: dict[str, type] diff --git a/stubs/pywin32/win32/lib/win32con.pyi b/stubs/pywin32/win32/lib/win32con.pyi index 6a7da2eb4913..1322355791df 100644 --- a/stubs/pywin32/win32/lib/win32con.pyi +++ b/stubs/pywin32/win32/lib/win32con.pyi @@ -2102,9 +2102,6 @@ FILE_ATTRIBUTE_NOT_CONTENT_INDEXED: Final = 8192 FILE_ATTRIBUTE_ENCRYPTED: Final = 16384 FILE_ATTRIBUTE_VIRTUAL: Final = 65536 -FILE_ATTRIBUTE_ATOMIC_WRITE: Final = 512 -FILE_ATTRIBUTE_XACTION_WRITE: Final = 1024 - FILE_NOTIFY_CHANGE_FILE_NAME: Final = 1 FILE_NOTIFY_CHANGE_DIR_NAME: Final = 2 FILE_NOTIFY_CHANGE_ATTRIBUTES: Final = 4 diff --git a/stubs/pywin32/win32/win32api.pyi b/stubs/pywin32/win32/win32api.pyi index 3a2185e29fd5..2a91822382fa 100644 --- a/stubs/pywin32/win32/win32api.pyi +++ b/stubs/pywin32/win32/win32api.pyi @@ -159,6 +159,7 @@ def GetProfileVal(section: str, entry: str, defValue: str, iniName: str | None = def GetShortPathName(path: str, /) -> str: ... def GetStdHandle(handle: int, /) -> int: ... def GetSysColor(index: int, /) -> int: ... +def GetSystemCpuSetInformation() -> list[_win32typing.PySYSTEM_CPU_SET_INFORMATION]: ... def GetSystemDefaultLangID() -> int: ... def GetSystemDefaultLCID() -> int: ... def GetSystemDirectory() -> str: ... diff --git a/stubs/pywin32/win32/win32clipboard.pyi b/stubs/pywin32/win32/win32clipboard.pyi index 355b97a533c0..27ed86573bbe 100644 --- a/stubs/pywin32/win32/win32clipboard.pyi +++ b/stubs/pywin32/win32/win32clipboard.pyi @@ -46,4 +46,3 @@ CF_TEXT: Final[int] CF_TIFF: Final[int] CF_UNICODETEXT: Final[int] CF_WAVE: Final[int] -UNICODE: bool diff --git a/stubs/pywin32/win32/win32gui.pyi b/stubs/pywin32/win32/win32gui.pyi index a002f39f78f2..ae7f7acf7458 100644 --- a/stubs/pywin32/win32/win32gui.pyi +++ b/stubs/pywin32/win32/win32gui.pyi @@ -557,5 +557,5 @@ TPM_RIGHTALIGN: int TPM_RIGHTBUTTON: int TPM_TOPALIGN: int TPM_VCENTERALIGN: int -UNICODE: Literal[True] +UNICODE: Literal[1] dllhandle: int diff --git a/stubs/pywin32/win32comext/axdebug/codecontainer.pyi b/stubs/pywin32/win32comext/axdebug/codecontainer.pyi index 62bc0606ab19..29dbc568a34b 100644 --- a/stubs/pywin32/win32comext/axdebug/codecontainer.pyi +++ b/stubs/pywin32/win32comext/axdebug/codecontainer.pyi @@ -1,7 +1,5 @@ from _typeshed import Incomplete -name: str - class SourceCodeContainer: sourceContext: Incomplete text: Incomplete