Manual fixes of nested unpacking \*\(.*\*.+\)

Author: Avasam

Pythonwin/pywin/Demos/ocx/ocxserialtest.py

@@ -8,7 +8,6 @@
 import pythoncom
 import win32con
 import win32ui
-import win32uiole
 from pywin.mfc import activex, dialog
 from win32com.client import gencache
 
@@ -68,7 +67,7 @@ def OnComm(self):
 
 class TestSerDialog(dialog.Dialog):
     def __init__(self, *args):
-        dialog.Dialog.__init__(*(self, *args))
+        dialog.Dialog.__init__(self, *args)
         self.olectl = None
 
     def OnComm(self):

Pythonwin/pywin/docking/DockingBar.py

@@ -96,7 +96,7 @@ def CreateWindow(
         self._obj_.CreateWindow(wndClass, title, style, (0, 0, 0, 0), parent, id)
 
         # Create the child dialog
-        self.dialog = childCreator(*(self, *childCreatorArgs))
+        self.dialog = childCreator(self, *childCreatorArgs)
 
         # use the dialog dimensions as default base dimensions
         assert self.dialog.IsWindow(), (

Pythonwin/pywin/tools/TraceCollector.py

@@ -38,7 +38,7 @@ def CollectorThread(stopEvent, file):
 
 class WindowOutput(winout.WindowOutput):
     def __init__(self, *args):
-        winout.WindowOutput.__init__(*(self, *args))
+        winout.WindowOutput.__init__(self, *args)
         self.hStopThread = win32event.CreateEvent(None, 0, 0, None)
         _thread.start_new(CollectorThread, (self.hStopThread, self))
 

com/win32com/client/__init__.py

@@ -567,7 +567,7 @@ def __setattr__(self, attr, value):
             args, defArgs = self._prop_map_put_[attr]
         except KeyError:
             raise AttributeError(f"'{self!r}' object has no attribute '{attr}'")
-        self._oleobj_.Invoke(*((*args, value, *defArgs)))
+        self._oleobj_.Invoke(*args, value, *defArgs)
 
     def _get_good_single_object_(self, obj, obUserName=None, resultCLSID=None):
         return _get_good_single_object_(obj, obUserName, resultCLSID)

com/win32com/client/dynamic.py

@@ -354,7 +354,7 @@ def _find_dispatch_type_(self, methodName):
 
     def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
         result = self._oleobj_.InvokeTypes(
-            *(dispid, LCID, wFlags, retType, argTypes, *args)
+            dispid, LCID, wFlags, retType, argTypes, *args
         )
         return self._get_good_object_(result, user, resultCLSID)
 
@@ -447,7 +447,7 @@ def _proc_(self, name, *args):
             item = self._olerepr_.mapFuncs[name]
             dispId = item.dispid
             return self._get_good_object_(
-                self._oleobj_.Invoke(*(dispId, LCID, item.desc[4], 0, *args))
+                self._oleobj_.Invoke(dispId, LCID, item.desc[4], 0, *args)
             )
         except KeyError:
             raise AttributeError(name)
@@ -505,7 +505,7 @@ def _LazyAddAttr_(self, attr):
                     r = olerepr._AddVar_(typeinfo, t, 0)
                 else:  # not found or TYPEDESC/IMPLICITAPP
                     r = None
-                if not r is None:
+                if r is not None:
                     key, map = r[0], r[1]
                     item = map[key]
                     if map == olerepr.propMapPut:

com/win32com/demos/ietoolbar.py

@@ -98,7 +98,7 @@ def toparam(self):
                     val = default
                 vals.append(val)
             full_fmt += fmt
-        return struct.pack(*(full_fmt, *tuple(vals)))
+        return struct.pack(full_fmt, *vals)
 
 
 class TBBUTTON(WIN32STRUCT):
@@ -365,4 +365,4 @@ def DllUnregisterServer():
         DllRegisterServer()
 else:
     # import trace utility for remote debugging
-    import win32traceutil
+    pass

com/win32com/server/connect.py

@@ -77,7 +77,7 @@ def _BroadcastNotify(self, broadcaster, extraArgs):
         # Ignores clients that fail.
         for interface in self.connections.values():
             try:
-                broadcaster(*(interface, *extraArgs))
+                broadcaster(interface, *extraArgs)
             except pythoncom.com_error as details:
                 self._OnNotifyFail(interface, details)
 

com/win32comext/axdebug/debugger.py

@@ -44,7 +44,7 @@ def BuildModule(module, built_nodes, rootNode, create_node_fn, create_node_args)
         # print("keeping", module.__name__)
         node = ModuleTreeNode(module)
         built_nodes[module] = node
-        realNode = create_node_fn(*(node, *create_node_args))
+        realNode = create_node_fn(node, *create_node_args)
         node.realNode = realNode
 
         # Split into parent nodes.

com/win32comext/axscript/client/framework.py

@@ -53,7 +53,7 @@ def profile(fn, *args):
     try:
         # roll on 1.6 :-)
         # 		return prof.runcall(fn, *args)
-        return prof.runcall(*(fn, *args))
+        return prof.runcall(fn, *args)
     finally:
         import pstats
 
@@ -413,10 +413,10 @@ def GetCreateSubItem(self, parentItem, name, dispatch, flags):
         try:
             rc = self.subItems[keyName]
             # No changes allowed to existing flags.
-            if not rc.flags is None and not flags is None and rc.flags != flags:
+            if rc.flags is not None and flags is not None and rc.flags != flags:
                 raise COMException(scode=winerror.E_INVALIDARG)
             # Existing item must not have a dispatch.
-            if not rc.dispatch is None and not dispatch is None:
+            if rc.dispatch is not None and dispatch is not None:
                 raise COMException(scode=winerror.E_INVALIDARG)
             rc.flags = flags  # Setup the real flags.
             rc.dispatch = dispatch

setup.py

@@ -48,7 +48,7 @@
 from distutils.command.install_data import install_data
 
 build_id_patch = build_id
-if "." not in build_id_patch:
+if not "." in build_id_patch:
     build_id_patch += ".0"
 pywin32_version = "%d.%d.%s" % (
     sys.version_info.major,
@@ -304,7 +304,7 @@ def __init__(self, name, **kw):
 
         # The stand-alone exchange SDK has these libs
         # Additional utility functions are only available for 32-bit builds.
-        if platform.machine() not in ("AMD64", "ARM64"):
+        if not platform.machine() in ("AMD64", "ARM64"):
             libs += " version user32 advapi32 Ex2KSdk sadapi netapi32"
         kw["libraries"] = libs
         WinExt_win32com.__init__(self, name, **kw)
@@ -1955,7 +1955,7 @@ def expand_modules(module_dir: str | os.PathLike[str]):
 # will 'do the right thing' in terms of installing licence.txt into
 # 'Lib/site-packages/pythonwin/licence.txt'.  We exploit this to
 # get 'com/win32com/whatever' installed to 'win32com/whatever'
-def convert_data_files(files: Iterable[str]):
+def convert_data_files(files: Iterable[str]) -> list[tuple[str, tuple[str]]]:
     ret: list[tuple[str, tuple[str]]] = []
     for file in files:
         file = os.path.normpath(file)
@@ -1980,8 +1980,8 @@ def convert_data_files(files: Iterable[str]):
     return ret
 
 
-def convert_optional_data_files(files):
-    ret = []
+def convert_optional_data_files(files) -> list[tuple[str, tuple[str]]]:
+    ret: list[tuple[str, tuple[str]]] = []
     for file in files:
         try:
             temp = convert_data_files([file])
@@ -2087,13 +2087,10 @@ def convert_optional_data_files(files):
     packages=packages,
     py_modules=py_modules,
     data_files=[
-        ("", (os.path.join(gettempdir(), "pywin32.version.txt"),)),
-        *convert_optional_data_files(
-            [
-                "PyWin32.chm",
-            ]
-        ),
-        *convert_data_files(
+        # mypy list-item: This needs to be fixed in typeshed's types-setuptools stubs
+        ("", (os.path.join(gettempdir(), "pywin32.version.txt"),)),  # type: ignore[list-item]
+        *convert_optional_data_files(["PyWin32.chm"]),  # type: ignore[list-item]
+        *convert_data_files(  # type: ignore[list-item]
             [
                 "Pythonwin/start_pythonwin.pyw",
                 "pythonwin/pywin/*.cfg",
@@ -2151,8 +2148,8 @@ def convert_optional_data_files(files):
             ]
         ),
         # The headers and .lib files
-        ("win32/include", ("win32/src/PyWinTypes.h",)),
-        (
+        ("win32/include", ("win32/src/PyWinTypes.h",)),  # type: ignore[list-item]
+        (  # type: ignore[list-item]
             "win32com/include",
             (
                 "com/win32com/src/include/PythonCOM.h",
@@ -2161,11 +2158,11 @@ def convert_optional_data_files(files):
             ),
         ),
         # And data files convert_data_files can't handle.
-        ("win32com", ("com/License.txt",)),
+        ("win32com", ("com/License.txt",)),  # type: ignore[list-item]
         # pythoncom.py doesn't quite fit anywhere else.
         # Note we don't get an auto .pyc - but who cares?
-        ("", ("com/pythoncom.py",)),
-        ("", ("pywin32.pth",)),
+        ("", ("com/pythoncom.py",)),  # type: ignore[list-item]
+        ("", ("pywin32.pth",)),  # type: ignore[list-item]
     ],
 )