From 50d392f3e3e3816d7f6faf0d49f95471beb2f0f9 Mon Sep 17 00:00:00 2001 From: newwingbird Date: Tue, 29 Oct 2024 13:44:41 +0900 Subject: [PATCH 1/3] fmt import --- comtypes/automation.py | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/comtypes/automation.py b/comtypes/automation.py index 54afae182..f62c4382e 100644 --- a/comtypes/automation.py +++ b/comtypes/automation.py @@ -4,29 +4,26 @@ import decimal import sys from ctypes import * -from ctypes import _Pointer, Array as _CArrayType -from _ctypes import CopyComPointer +from ctypes import Array as _CArrayType +from ctypes import _Pointer from ctypes.wintypes import DWORD, LONG, UINT, VARIANT_BOOL, WCHAR, WORD -from typing import Any, ClassVar, Dict, List, Optional, TYPE_CHECKING, Type +from typing import TYPE_CHECKING, Any, ClassVar, Dict, List, Optional, Type + +from _ctypes import CopyComPointer -from comtypes import _CData, BSTR, COMError, COMMETHOD, GUID, IID, IUnknown, STDMETHOD -from comtypes.hresult import * -from comtypes._memberspec import _DispMemberSpec -import comtypes.patcher import comtypes +import comtypes.patcher +from comtypes import BSTR, COMMETHOD, GUID, IID, STDMETHOD, COMError, IUnknown, _CData +from comtypes._memberspec import _DispMemberSpec +from comtypes.hresult import * +from comtypes.safearray import _midlSAFEARRAY if TYPE_CHECKING: from ctypes import _CArgObject + from comtypes import hints # type: ignore - from comtypes import _safearray else: _CArgObject = type(byref(c_int())) - try: - from comtypes import _safearray - except (ImportError, AttributeError): - - class _safearray(object): - tagSAFEARRAY = None LCID = DWORD @@ -991,12 +988,6 @@ def Invoke(self, dispid: int, *args: Any, **kw: Any) -> Any: _ctype_to_vartype[c_char] = VT_UI1 -try: - from comtypes.safearray import _midlSAFEARRAY -except (ImportError, AttributeError): - pass - - # fmt: off __known_symbols__ = [ "CURRENCY", "CY", "tagCY", "DECIMAL", "tagDEC", "DISPATCH_METHOD", From 4dcc50dfe87a83e6bffbcc2e3e57539ce964ba38 Mon Sep 17 00:00:00 2001 From: newwingbird Date: Tue, 29 Oct 2024 14:06:48 +0900 Subject: [PATCH 2/3] fixed import --- comtypes/automation.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/comtypes/automation.py b/comtypes/automation.py index f62c4382e..35e4327ad 100644 --- a/comtypes/automation.py +++ b/comtypes/automation.py @@ -13,7 +13,17 @@ import comtypes import comtypes.patcher -from comtypes import BSTR, COMMETHOD, GUID, IID, STDMETHOD, COMError, IUnknown, _CData +from comtypes import ( + BSTR, + COMMETHOD, + GUID, + IID, + STDMETHOD, + COMError, + IUnknown, + _CData, + _safearray, +) from comtypes._memberspec import _DispMemberSpec from comtypes.hresult import * from comtypes.safearray import _midlSAFEARRAY From cdb7e819fb87ed2d26adb5e2036098ea33210769 Mon Sep 17 00:00:00 2001 From: newwingbird Date: Sat, 16 Nov 2024 15:40:21 +0900 Subject: [PATCH 3/3] fmt inport statements --- comtypes/automation.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/comtypes/automation.py b/comtypes/automation.py index 35e4327ad..fa7b68c86 100644 --- a/comtypes/automation.py +++ b/comtypes/automation.py @@ -9,21 +9,11 @@ from ctypes.wintypes import DWORD, LONG, UINT, VARIANT_BOOL, WCHAR, WORD from typing import TYPE_CHECKING, Any, ClassVar, Dict, List, Optional, Type -from _ctypes import CopyComPointer +from _ctypes import COMError, CopyComPointer import comtypes import comtypes.patcher -from comtypes import ( - BSTR, - COMMETHOD, - GUID, - IID, - STDMETHOD, - COMError, - IUnknown, - _CData, - _safearray, -) +from comtypes import BSTR, COMMETHOD, GUID, IID, STDMETHOD, IUnknown, _CData, _safearray from comtypes._memberspec import _DispMemberSpec from comtypes.hresult import * from comtypes.safearray import _midlSAFEARRAY