Update tools/**/*.py, server/*.py and client/*.py files for PEP585 compliance. (#879)

* Update `comtypes/client/_activeobj.py` for PEP585 compliance.

* Update `comtypes/client/_create.py` for PEP585 compliance.

* Update `comtypes/client/_events.py` for PEP585 compliance.

* Update `comtypes/client/_generate.py` for PEP585 compliance.

* Update `comtypes/client/_managing.py` for PEP585 compliance.

* Update `comtypes/client/dynamic.py` for PEP585 compliance.

* Update `comtypes/server/__init__.py` for PEP585 compliance.

* Update `comtypes/server/connectionpoints.py` for PEP585 compliance.

* Update `comtypes/server/inprocserver.py` for PEP585 compliance.

* Update `comtypes/server/localserver.py` for PEP585 compliance.

* Update `comtypes/server/register.py` for PEP585 compliance.

* Update `comtypes/server/w_getopt.py` for PEP585 compliance.

* Update `comtypes/tools/codegenerator/codegenerator.py` for PEP585 compliance.

* Update `comtypes/tools/codegenerator/heads.py` for PEP585 compliance.

* Update `comtypes/tools/codegenerator/helpers.py` for PEP585 compliance.

* Update `comtypes/tools/codegenerator/namespaces.py` for PEP585 compliance.

* Update `comtypes/tools/codegenerator/typeannotator.py` for PEP585 compliance.

* Update `comtypes/tools/tlbparser.py` for PEP585 compliance.

* Update `comtypes/tools/typedesc.py` for PEP585 compliance.

* Update `comtypes/tools/typedesc_base.py` for PEP585 compliance.

Author: junkmd

comtypes/client/_activeobj.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Type, TypeVar, overload
+from typing import Any, Optional, TypeVar, overload
 from typing import Union as _UnionT
 
 import comtypes
@@ -14,14 +14,14 @@
 # Object creation
 #
 @overload
-def GetActiveObject(progid: _UnionT[str, Type[CoClass], GUID]) -> Any: ...
+def GetActiveObject(progid: _UnionT[str, type[CoClass], GUID]) -> Any: ...
 @overload
 def GetActiveObject(
-    progid: _UnionT[str, Type[CoClass], GUID], interface: Type[_T_IUnknown]
+    progid: _UnionT[str, type[CoClass], GUID], interface: type[_T_IUnknown]
 ) -> _T_IUnknown: ...
 def GetActiveObject(
-    progid: _UnionT[str, Type[CoClass], GUID],
-    interface: Optional[Type[IUnknown]] = None,
+    progid: _UnionT[str, type[CoClass], GUID],
+    interface: Optional[type[IUnknown]] = None,
     dynamic: bool = False,
 ) -> Any:
     """Return a pointer to a running COM object that has been
@@ -47,7 +47,7 @@ def GetActiveObject(
 
 
 def RegisterActiveObject(
-    punk: IUnknown, progid: _UnionT[str, Type[CoClass], GUID], weak: bool = True
+    punk: IUnknown, progid: _UnionT[str, type[CoClass], GUID], weak: bool = True
 ) -> int:
     clsid = GUID.from_progid(progid)
     flags = comtypes.ACTIVEOBJECT_WEAK if weak else comtypes.ACTIVEOBJECT_STRONG

comtypes/client/_create.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, Any, Optional, Type, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Optional, TypeVar, overload
 from typing import Union as _UnionT
 
 import comtypes
@@ -23,22 +23,22 @@
 
     @overload
     def GetClassObject(
-        progid: _UnionT[str, Type[CoClass], GUID],
+        progid: _UnionT[str, type[CoClass], GUID],
         clsctx: Optional[int] = None,
         pServerInfo: Optional[COSERVERINFO] = None,
         interface: None = None,
     ) -> hints.IClassFactory: ...
     @overload
     def GetClassObject(
-        progid: _UnionT[str, Type[CoClass], GUID],
+        progid: _UnionT[str, type[CoClass], GUID],
         clsctx: Optional[int] = None,
         pServerInfo: Optional[COSERVERINFO] = None,
-        interface: Type[_T_IUnknown] = hints.IClassFactory,
+        interface: type[_T_IUnknown] = hints.IClassFactory,
     ) -> _T_IUnknown: ...
 
 
 def GetClassObject(progid, clsctx=None, pServerInfo=None, interface=None):
-    # type: (_UnionT[str, Type[CoClass], GUID], Optional[int], Optional[COSERVERINFO], Optional[Type[IUnknown]]) -> IUnknown
+    # type: (_UnionT[str, type[CoClass], GUID], Optional[int], Optional[COSERVERINFO], Optional[type[IUnknown]]) -> IUnknown
     """Create and return the class factory for a COM object.
 
     'clsctx' specifies how to create the object, use the CLSCTX_... constants.
@@ -50,21 +50,21 @@ def GetClassObject(progid, clsctx=None, pServerInfo=None, interface=None):
 
 
 @overload
-def CreateObject(progid: _UnionT[str, Type[CoClass], GUID]) -> Any: ...
+def CreateObject(progid: _UnionT[str, type[CoClass], GUID]) -> Any: ...
 @overload
 def CreateObject(
-    progid: _UnionT[str, Type[CoClass], GUID],
+    progid: _UnionT[str, type[CoClass], GUID],
     clsctx: Optional[int] = None,
     machine: Optional[str] = None,
-    interface: Optional[Type[_T_IUnknown]] = None,
+    interface: Optional[type[_T_IUnknown]] = None,
     dynamic: bool = ...,
     pServerInfo: Optional[COSERVERINFO] = None,
 ) -> _T_IUnknown: ...
 def CreateObject(
-    progid: _UnionT[str, Type[CoClass], GUID],  # which object to create
+    progid: _UnionT[str, type[CoClass], GUID],  # which object to create
     clsctx: Optional[int] = None,  # how to create the object
     machine: Optional[str] = None,  # where to create the object
-    interface: Optional[Type[IUnknown]] = None,  # the interface we want
+    interface: Optional[type[IUnknown]] = None,  # the interface we want
     dynamic: bool = False,  # use dynamic dispatch
     pServerInfo: Optional[COSERVERINFO] = None,  # server info struct for remoting
 ) -> Any:
@@ -123,14 +123,14 @@ def CreateObject(
 
 
 @overload
-def CoGetObject(displayname: str, interface: Type[_T_IUnknown]) -> _T_IUnknown: ...
+def CoGetObject(displayname: str, interface: type[_T_IUnknown]) -> _T_IUnknown: ...
 @overload
 def CoGetObject(
     displayname: str, interface: None = None, dynamic: bool = False
 ) -> Any: ...
 def CoGetObject(
     displayname: str,
-    interface: Optional[Type[IUnknown]] = None,
+    interface: Optional[type[IUnknown]] = None,
     dynamic: bool = False,
 ) -> Any:
     """Create an object by calling CoGetObject(displayname).

comtypes/client/_events.py

@@ -2,6 +2,7 @@
 import logging
 import traceback
 from _ctypes import COMError
+from collections.abc import Callable
 from ctypes import HRESULT, POINTER, WINFUNCTYPE, OleDLL, Structure, WinDLL, byref
 from ctypes.wintypes import (
     BOOL,
@@ -13,7 +14,7 @@
     LPVOID,
     ULONG,
 )
-from typing import Any, Callable, Optional, Type
+from typing import Any, Optional
 from typing import Union as _UnionT
 
 import comtypes
@@ -70,7 +71,7 @@ class _AdviseConnection:
     receiver: Optional[_ReceiverType]
 
     def __init__(
-        self, source: IUnknown, interface: Type[IUnknown], receiver: _ReceiverType
+        self, source: IUnknown, interface: type[IUnknown], receiver: _ReceiverType
     ) -> None:
         # Pre-initializing attributes to avoid AttributeError after failed connection.
         self.cp = None
@@ -79,7 +80,7 @@ def __init__(
         self._connect(source, interface, receiver)
 
     def _connect(
-        self, source: IUnknown, interface: Type[IUnknown], receiver: _ReceiverType
+        self, source: IUnknown, interface: type[IUnknown], receiver: _ReceiverType
     ) -> None:
         cpc = source.QueryInterface(IConnectionPointContainer)
         self.cp = cpc.FindConnectionPoint(byref(interface._iid_))
@@ -109,7 +110,7 @@ def __del__(self) -> None:
             pass
 
 
-def FindOutgoingInterface(source: IUnknown) -> Type[IUnknown]:
+def FindOutgoingInterface(source: IUnknown) -> type[IUnknown]:
     """XXX Describe the strategy that is used..."""
     # If the COM object implements IProvideClassInfo2, it is easy to
     # find the default outgoing interface.
@@ -237,11 +238,11 @@ def _find_method(self, fq_name: str, mthname: str) -> Callable[..., Any]:
                 return getattr(self.sink, mthname)
 
 
-def CreateEventReceiver(interface: Type[IUnknown], handler: Any) -> COMObject:
+def CreateEventReceiver(interface: type[IUnknown], handler: Any) -> COMObject:
     class Sink(COMObject):
         _com_interfaces_ = [interface]
 
-        def _get_method_finder_(self, itf: Type[IUnknown]) -> _MethodFinder:
+        def _get_method_finder_(self, itf: type[IUnknown]) -> _MethodFinder:
             # Use a special MethodFinder that will first try 'self',
             # then the sink.
             return _SinkMethodFinder(self, handler)
@@ -267,7 +268,7 @@ def _get_method_finder_(self, itf: Type[IUnknown]) -> _MethodFinder:
 
 
 def GetEvents(
-    source: IUnknown, sink: Any, interface: Optional[Type[IUnknown]] = None
+    source: IUnknown, sink: Any, interface: Optional[type[IUnknown]] = None
 ) -> _AdviseConnection:
     """Receive COM events from 'source'.  Events will call methods on
     the 'sink' object.  'interface' is the source interface to use.
@@ -301,7 +302,7 @@ def handler(self, this, *args, **kw):
 
 
 def ShowEvents(
-    source: IUnknown, interface: Optional[Type[IUnknown]] = None
+    source: IUnknown, interface: Optional[type[IUnknown]] = None
 ) -> _AdviseConnection:
     """Receive COM events from 'source'.  A special event sink will be
     used that first prints the names of events that are found in the

comtypes/client/_generate.py

@@ -6,7 +6,8 @@
 import sys
 import types
 import winreg
-from typing import Any, Dict, List, Mapping, Optional, Tuple
+from collections.abc import Mapping
+from typing import Any, Optional
 from typing import Union as _UnionT
 
 import comtypes.client
@@ -25,7 +26,7 @@ def _my_import(fullname: str) -> types.ModuleType:
     return importlib.import_module(fullname)
 
 
-def _resolve_filename(tlib_string: str, dirpath: str) -> Tuple[str, bool]:
+def _resolve_filename(tlib_string: str, dirpath: str) -> tuple[str, bool]:
     """Tries to make sense of a type library specified as a string.
 
     Args:
@@ -225,7 +226,7 @@ def generate(self) -> types.ModuleType:
         """Generates wrapper and friendly modules."""
         known_symbols, known_interfaces = _get_known_namespaces()
         codegen = codegenerator.CodeGenerator(known_symbols, known_interfaces)
-        codebases: List[Tuple[str, str]] = []
+        codebases: list[tuple[str, str]] = []
         logger.info("# Generating %s", self.wrapper_name)
         items = list(tlbparser.TypeLibParser(self.tlib).parse().values())
         wrp_code = codegen.generate_wrapper_code(items, filename=self.pathname)
@@ -246,7 +247,7 @@ def generate(self) -> types.ModuleType:
 
 
 def _get_known_namespaces() -> (
-    Tuple[Mapping[_SymbolName, _ModuleName], Mapping[_ItfName, _ItfIid]]
+    tuple[Mapping[_SymbolName, _ModuleName], Mapping[_ItfName, _ItfIid]]
 ):
     """Returns symbols and interfaces that are already statically defined in `ctypes`
     and `comtypes`.
@@ -260,8 +261,8 @@ def _get_known_namespaces() -> (
         `comtypes` does NOT aim to statically define all COM object interfaces in
         its repository.
     """
-    known_symbols: Dict[_SymbolName, _ModuleName] = {}
-    known_interfaces: Dict[_ItfName, _ItfIid] = {}
+    known_symbols: dict[_SymbolName, _ModuleName] = {}
+    known_interfaces: dict[_ItfName, _ItfIid] = {}
     for mod_name in (
         "comtypes.persist",
         "comtypes.typeinfo",
@@ -273,7 +274,7 @@ def _get_known_namespaces() -> (
     ):
         mod = importlib.import_module(mod_name)
         if hasattr(mod, "__known_symbols__"):
-            names: List[str] = mod.__known_symbols__
+            names: list[str] = mod.__known_symbols__
             for name in names:
                 tgt = getattr(mod, name)
                 if inspect.isclass(tgt) and issubclass(tgt, comtypes.IUnknown):

comtypes/client/_managing.py

@@ -1,6 +1,6 @@
 import logging
 from _ctypes import COMError
-from typing import Any, Optional, Type
+from typing import Any, Optional
 
 import comtypes
 import comtypes.client.dynamic
@@ -106,7 +106,7 @@ def GetBestInterface(punk: Any) -> Any:
 
 
 def _manage(
-    obj: Any, clsid: Optional[GUID], interface: Optional[Type[IUnknown]]
+    obj: Any, clsid: Optional[GUID], interface: Optional[type[IUnknown]]
 ) -> Any:
     obj.__dict__["__clsid"] = str(clsid)
     if interface is None:

comtypes/client/dynamic.py

@@ -1,5 +1,5 @@
 import ctypes
-from typing import Any, Dict, Optional, Set, Type, TypeVar
+from typing import Any, Optional, TypeVar
 
 from comtypes import GUID, COMError, IUnknown, _is_object, automation
 from comtypes import hresult as hres
@@ -63,8 +63,8 @@ class _Dispatch:
     """Expose methods and properties via fully dynamic dispatch."""
 
     _comobj: automation.IDispatch
-    _ids: Dict[str, int]
-    _methods: Set[str]
+    _ids: dict[str, int]
+    _methods: set[str]
 
     def __init__(self, comobj: "ctypes._Pointer[automation.IDispatch]"):
         self.__dict__["_comobj"] = comobj
@@ -90,7 +90,7 @@ def __getitem__(self, index: Any) -> Any:
         return item
 
     def QueryInterface(
-        self, interface: Type[_T_IUnknown], iid: Optional[GUID] = None
+        self, interface: type[_T_IUnknown], iid: Optional[GUID] = None
     ) -> _T_IUnknown:
         """QueryInterface is forwarded to the real com object."""
         return self._comobj.QueryInterface(interface, iid)

comtypes/server/__init__.py

@@ -1,6 +1,6 @@
 import ctypes
 from ctypes import HRESULT, POINTER, byref
-from typing import TYPE_CHECKING, Any, Optional, Type
+from typing import TYPE_CHECKING, Any, Optional
 
 import comtypes
 import comtypes.client
@@ -30,8 +30,8 @@ class IClassFactory(IUnknown):
 
     def CreateInstance(
         self,
-        punkouter: Optional[Type["_Pointer[IUnknown]"]] = None,
-        interface: Optional[Type[IUnknown]] = None,
+        punkouter: Optional[type["_Pointer[IUnknown]"]] = None,
+        interface: Optional[type[IUnknown]] = None,
         dynamic: bool = False,
     ) -> Any:
         if dynamic:

comtypes/server/connectionpoints.py

@@ -1,9 +1,10 @@
 import functools
 import logging
 from _ctypes import COMError
+from collections.abc import Callable, Iterator
 from ctypes import c_void_p, pointer
 from ctypes.wintypes import DWORD
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Tuple, Type
+from typing import TYPE_CHECKING, Any
 from typing import Union as _UnionT
 
 from comtypes import GUID, COMObject, IUnknown
@@ -29,10 +30,10 @@ class ConnectionPointImpl(COMObject):
     _com_interfaces_ = [IConnectionPoint]
 
     def __init__(
-        self, sink_interface: Type[IUnknown], sink_typeinfo: ITypeInfo
+        self, sink_interface: type[IUnknown], sink_typeinfo: ITypeInfo
     ) -> None:
         super().__init__()
-        self._connections: Dict[int, IUnknown] = {}
+        self._connections: dict[int, IUnknown] = {}
         self._cookie = 0
         self._sink_interface = sink_interface
         self._typeinfo = sink_typeinfo
@@ -72,7 +73,7 @@ def IConnectionPoint_GetConnectionInterface(
     ) -> "hints.Hresult":
         return E_NOTIMPL
 
-    def _call_sinks(self, name: str, *args: Any, **kw: Any) -> List[Any]:
+    def _call_sinks(self, name: str, *args: Any, **kw: Any) -> list[Any]:
         results = []
         logger.debug("_call_sinks(%s, %s, *%s, **%s)", self, name, args, kw)
         # Is it an IDispatch derived interface?  Then, events have to be delivered
@@ -118,12 +119,12 @@ class ConnectableObjectMixin:
     """
 
     if TYPE_CHECKING:
-        _outgoing_interfaces_: ClassVar[List[Type[IDispatch]]]
-        _reg_typelib_: ClassVar[Tuple[str, int, int]]
+        _outgoing_interfaces_: ClassVar[list[type[IDispatch]]]
+        _reg_typelib_: ClassVar[tuple[str, int, int]]
 
     def __init__(self) -> None:
         super().__init__()
-        self.__connections: Dict[Type[IDispatch], ConnectionPointImpl] = {}
+        self.__connections: dict[type[IDispatch], ConnectionPointImpl] = {}
 
         tlib = LoadRegTypeLib(*self._reg_typelib_)
         for itf in self._outgoing_interfaces_:
@@ -161,7 +162,7 @@ def IConnectionPointContainer_FindConnectionPoint(
         return CONNECT_E_NOCONNECTION
 
     def Fire_Event(
-        self, itf: _UnionT[int, Type[IDispatch]], name: str, *args: Any, **kw: Any
+        self, itf: _UnionT[int, type[IDispatch]], name: str, *args: Any, **kw: Any
     ) -> Any:
         # Fire event 'name' with arguments *args and **kw.
         # Accepts either an interface index or an interface as first argument.