comtypes 1.4.8__zip → 1.4.9__zip

{comtypes-1.4.8 → comtypes-1.4.9}/comtypes/tools/typedesc.py

@@ -20,12 +20,7 @@ class TypeLib(object):
         self.doc = doc
 
     def __repr__(self):
-        return "<TypeLib(%s: %s, %s, %s)>" % (
-            self.name,
-            self.guid,
-            self.major,
-            self.minor,
-        )
+        return f"<TypeLib({self.name}: {self.guid}, {self.major}, {self.minor})>"
 
 
 class Constant(object):

{comtypes-1.4.8 → comtypes-1.4.9}/comtypes/typeinfo.py

@@ -12,7 +12,7 @@ import weakref
 
 import ctypes
 from ctypes import HRESULT, POINTER, _Pointer, byref, c_int, c_void_p, c_wchar_p
-from ctypes.wintypes import DWORD, LONG, UINT, ULONG, WCHAR, WORD
+from ctypes.wintypes import DWORD, LONG, UINT, ULONG, WCHAR, WORD, INT, SHORT, USHORT
 from comtypes import BSTR, _CData, COMMETHOD, GUID, IID, IUnknown, STDMETHOD
 from comtypes.automation import DISPID, LCID, SCODE
 from comtypes.automation import DISPPARAMS, EXCEPINFO, VARIANT, VARIANTARG, VARTYPE
@@ -28,15 +28,12 @@ is_64_bit = sys.maxsize > 2**32
 
 BOOL = c_int
 HREFTYPE = DWORD
-INT = c_int
 MEMBERID = DISPID
 OLECHAR = WCHAR
 PVOID = c_void_p
-SHORT = ctypes.c_short
 # See https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx#ULONG_PTR  # noqa
 ULONG_PTR = ctypes.c_uint64 if is_64_bit else ctypes.c_ulong
 
-USHORT = ctypes.c_ushort
 LPOLESTR = POINTER(OLECHAR)
 
 ################################################################
@@ -632,7 +629,11 @@ def LoadTypeLib(szFile: str) -> ITypeLib:
 
 
 def UnRegisterTypeLib(
-    libID: str, wVerMajor: int, wVerMinor: int, lcid: int = 0, syskind: int = SYS_WIN32
+    libID: str,
+    wVerMajor: int,
+    wVerMinor: int,
+    lcid: int = 0,
+    syskind: int = (SYS_WIN64 if is_64_bit else SYS_WIN32),
 ) -> int:
     """Unregister a registered type library"""
     return _oleaut32.UnRegisterTypeLib(
@@ -680,13 +681,7 @@ class tagTLIBATTR(ctypes.Structure):
         wLibFlags: int
 
     def __repr__(self):
-        return "TLIBATTR(GUID=%s, Version=%s.%s, LCID=%s, FLags=0x%x)" % (
-            self.guid,
-            self.wMajorVerNum,
-            self.wMinorVerNum,
-            self.lcid,
-            self.wLibFlags,
-        )
+        return f"TLIBATTR(GUID={self.guid}, Version={self.wMajorVerNum}.{self.wMinorVerNum}, LCID={self.lcid}, FLags=0x{self.wLibFlags:x})"
 
 
 TLIBATTR = tagTLIBATTR
@@ -715,13 +710,7 @@ class tagTYPEATTR(ctypes.Structure):
         idldescType: "IDLDESC"
 
     def __repr__(self):
-        return "TYPEATTR(GUID=%s, typekind=%s, funcs=%s, vars=%s, impltypes=%s)" % (
-            self.guid,
-            self.typekind,
-            self.cFuncs,
-            self.cVars,
-            self.cImplTypes,
-        )
+        return f"TYPEATTR(GUID={self.guid}, typekind={self.typekind}, funcs={self.cFuncs}, vars={self.cVars}, impltypes={self.cImplTypes})"
 
 
 TYPEATTR = tagTYPEATTR
@@ -745,14 +734,14 @@ class tagFUNCDESC(ctypes.Structure):
 
     def __repr__(self):
         return (
-            "FUNCDESC("
+            f"FUNCDESC("
             f"memid={self.memid}, "
             f"cParams={self.cParams}, "
             f"cParamsOpt={self.cParamsOpt}, "
             f"callconv={self.callconv}, "
-            f"invkind={self.invkind,}, "
+            f"invkind={self.invkind}, "
             f"funckind={self.funckind}"
-            ")"
+            f")"
         )
 
 

{comtypes-1.4.8 → comtypes-1.4.9}/comtypes/viewobject.py

@@ -61,11 +61,7 @@ class tagExtentInfo(Structure):
 
     def __repr__(self):
         size = (self.sizelProposed.cx, self.sizelProposed.cy)
-        return "<ExtentInfo(mode=%s, size=%s) at %x>" % (
-            self.dwExtentMode,
-            size,
-            id(self),
-        )
+        return f"<ExtentInfo(mode={self.dwExtentMode}, size={size}) at {id(self):x}>"
 
 
 assert sizeof(tagExtentInfo) == 16, sizeof(tagExtentInfo)

{comtypes-1.4.8 → comtypes-1.4.9/comtypes.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comtypes
-Version: 1.4.8
+Version: 1.4.9
 Summary: Pure Python COM package
 Home-page: https://github.com/enthought/comtypes
 Download-URL: https://github.com/enthought/comtypes/releases
@@ -99,4 +99,4 @@ However, if the script implementation does not use `comtypes.client.GetModule` o
 
 ## Documentation
 
-The documentation is currently hosted [here](https://pythonhosted.org/comtypes) on PythonHosted.
+The documentation is currently hosted [here](https://comtypes.readthedocs.io/) on ReadTheDocs.

{comtypes-1.4.8 → comtypes-1.4.9}/comtypes.egg-info/SOURCES.txt

@@ -8,13 +8,12 @@ setup.py
 comtypes/GUID.py
 comtypes/__init__.py
 comtypes/_comobject.py
-comtypes/_idl_stuff.py
 comtypes/_memberspec.py
 comtypes/_meta.py
 comtypes/_npsupport.py
-comtypes/_py_instance_method.py
 comtypes/_safearray.py
 comtypes/_tlib_version_checker.py
+comtypes/_vtbl.py
 comtypes/automation.py
 comtypes/clear_cache.py
 comtypes/connectionpoints.py
@@ -38,7 +37,9 @@ comtypes.egg-info/dependency_links.txt
 comtypes.egg-info/entry_points.txt
 comtypes.egg-info/top_level.txt
 comtypes/_post_coinit/__init__.py
+comtypes/_post_coinit/_cominterface_meta_patcher.py
 comtypes/_post_coinit/bstr.py
+comtypes/_post_coinit/instancemethod.py
 comtypes/_post_coinit/misc.py
 comtypes/_post_coinit/unknwn.py
 comtypes/client/__init__.py
@@ -81,6 +82,7 @@ comtypes/test/test_client.py
 comtypes/test/test_client_dynamic.py
 comtypes/test/test_client_regenerate_modules.py
 comtypes/test/test_collections.py
+comtypes/test/test_comobject.py
 comtypes/test/test_comserver.py
 comtypes/test/test_createwrappers.py
 comtypes/test/test_dict.py
@@ -102,12 +104,12 @@ comtypes/test/test_msscript.py
 comtypes/test/test_npsupport.py
 comtypes/test/test_outparam.py
 comtypes/test/test_persist.py
-comtypes/test/test_propputref.py
 comtypes/test/test_pump_events.py
 comtypes/test/test_recordinfo.py
 comtypes/test/test_safearray.py
 comtypes/test/test_sapi.py
 comtypes/test/test_server.py
+comtypes/test/test_server_register.py
 comtypes/test/test_shelllink.py
 comtypes/test/test_showevents.py
 comtypes/test/test_storage.py
@@ -117,6 +119,7 @@ comtypes/test/test_typeannotator.py
 comtypes/test/test_typeinfo.py
 comtypes/test/test_urlhistory.py
 comtypes/test/test_variant.py
+comtypes/test/test_w_getopt.py
 comtypes/test/test_win32com_interop.py
 comtypes/test/test_wmi.py
 comtypes/test/test_word.py

{comtypes-1.4.8 → comtypes-1.4.9}/pyproject.toml

@@ -9,6 +9,7 @@ ignore = ["E402"]
 # production
 "comtypes/_comobject.py" = ["E713", "E722", "F401"]
 "comtypes/_npsupport.py" = ["F401"]
+"comtypes/_vtbl.py" = ["E722"]
 "comtypes/connectionpoints.py" = ["F401", "F403", "F405"]
 "comtypes/automation.py" = ["F401", "F403", "F405"]
 "comtypes/errorinfo.py" = ["F403", "F405"]