Merge branch 'main' into Native-ARM64-CI-wheels

Author: Avasam

.github/workflows/main.yml

@@ -181,17 +181,25 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
       - run: pip install clang-format==18.1.* pycln
+      # !cancelled(): Show issues even if the previous steps failed. But still fail the job
       - run: pycln . --config=pycln.toml --check
-      - uses: astral-sh/ruff-action@v3
+      - name: Run Ruff linter
+        uses: astral-sh/ruff-action@v3
         with:
-          version: "0.8.4"
-      - run: ruff format --check
+          version: "0.11.0"
+        if: ${{ !cancelled() }}
+      - name: Run Ruff formatter
+        run: ruff format --check
+        if: ${{ !cancelled() }}
       # Too many files to fit in a single command, also exclude vendored Scintilla and MAPIStubLibrary
       - run: |
           clang-format --Werror --dry-run $(git ls-files '*.cpp' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
           if ($LastExitCode -ne 0) { exit $LastExitCode }
+        if: ${{ !cancelled() }}
+      - run: |
           clang-format --Werror --dry-run $(git ls-files '*.h' ':!:Pythonwin/Scintilla/' ':!:com/win32comext/mapi/src/MAPIStubLibrary/')
           if ($LastExitCode -ne 0) { exit $LastExitCode }
+        if: ${{ !cancelled() }}
 
   mypy:
     runs-on: windows-2019

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
         args: [--config=pycln.toml]
         verbose: true
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.11.0
     hooks:
       - id: ruff # Run the linter.
         args: [--fix]

AutoDuck/BuildHHP.py

@@ -65,9 +65,9 @@ def handle_globs(lGlobs):
         sCommonPrefix = os.path.split(sCommonPrefix)[0]
         sCommonPrefix = os.path.normpath(sCommonPrefix) + "\\"
     # else we have a trailing slash - it means we _expect_ it to be a patch as-is.
-    assert (
-        os.path.isdir(sCommonPrefix) and sCommonPrefix[-1] == "\\"
-    ), "commonprefix splitting ain't gunna work!"
+    assert os.path.isdir(sCommonPrefix) and sCommonPrefix[-1] == "\\", (
+        "commonprefix splitting ain't gunna work!"
+    )
     print("sCommonPrefix=", sCommonPrefix)
     # Ok, now remove this common prefix from every file:
     lRelativeFiles = []

AutoDuck/document_object.py

@@ -13,9 +13,9 @@ def startElement(self, name, attrs):
             self.document.categories.append(Category(attrs))
         elif name == "overviews":
             category = self.document.categories[-1]
-            assert (
-                category.overviewItems is None
-            ), f"category {category!r} already has overviews"
+            assert category.overviewItems is None, (
+                f"category {category!r} already has overviews"
+            )
             category.overviewItems = OverviewItems(attrs)
         elif name == "item":
             item = Item(attrs)

AutoDuck/py2d.py

@@ -24,7 +24,7 @@ def BuildArgInfos(ob):
         info = DocInfo(n, ob)
         info.short_desc = info.desc = n
         info.default = ""
-        if len(defs):
+        if defs:
             default = repr(defs.pop())
             # the default may be an object, so the repr gives '<...>' - and
             # the angle brackets screw autoduck.

CHANGES.txt

@@ -17,6 +17,12 @@ Coming in build 311, as yet unreleased
 * Fixed `TypeError: cannot unpack non-iterable NoneType object` when registering an axscript client ScriptItem (#2513, @Avasam)
 * Fixed a memory leak when SafeArrays are used as out parameters (@the-snork)
 * Fixed dispatch handling for properties (@the-snork)
+* Resolved a handful of deprecation warnings (#2567, #2576, @Avasam)
+* The following classes now produce a valid `eval` string representation when calling `repr`: (#2573, @Avasam)
+  * `pywin.tools.browser.HLIPythonObject`
+  * `win32com.server.exception.COMException`
+  * `win32comext.axscript.client.error.AXScriptException`
+  * `win32comext.axscript.client.pyscript.NamedScriptAttribute`
 
 Build 310, released 2025/03/16
 ------------------------------

Pythonwin/pywin/dialogs/status.py

@@ -202,7 +202,7 @@ def ThreadedStatusProgressDialog(title, msg="", maxticks=100):
     # event - so use a dumb strategy
     end_time = time.time() + 10
     while time.time() < end_time:
-        if t.createdEvent.isSet():
+        if t.createdEvent.is_set():
             break
         win32ui.PumpWaitingMessages()
         time.sleep(0.1)

Pythonwin/pywin/scintilla/control.py

@@ -424,9 +424,9 @@ def GetSelText(self):
 
     def SetSel(self, start=0, end=None):
         if isinstance(start, tuple):
-            assert (
-                end is None
-            ), "If you pass a point in the first param, the second must be None"
+            assert end is None, (
+                "If you pass a point in the first param, the second must be None"
+            )
             start, end = start
         elif end is None:
             end = start
@@ -453,9 +453,9 @@ def GetLineCount(self):
     def LineFromChar(self, charPos=-1):
         if charPos == -1:
             charPos = self.GetSel()[0]
-        assert (
-            charPos >= 0 and charPos <= self.GetTextLength()
-        ), f"The charPos postion ({charPos}) is invalid (max={self.GetTextLength()})"
+        assert charPos >= 0 and charPos <= self.GetTextLength(), (
+            f"The charPos postion ({charPos}) is invalid (max={self.GetTextLength()})"
+        )
         # return self.SendScintilla(EM_EXLINEFROMCHAR, charPos)
         # EM_EXLINEFROMCHAR puts charPos in lParam, not wParam
         return self.SendScintilla(EM_EXLINEFROMCHAR, 0, charPos)
@@ -476,9 +476,9 @@ def GetTextRange(self, start=0, end=-1, decode=True):
         if end == -1:
             end = self.SendScintilla(scintillacon.SCI_GETTEXTLENGTH)
         assert end >= start, "Negative index requested (%d/%d)" % (start, end)
-        assert (
-            start >= 0 and start <= self.GetTextLength()
-        ), "The start postion is invalid"
+        assert start >= 0 and start <= self.GetTextLength(), (
+            "The start postion is invalid"
+        )
         assert end >= 0 and end <= self.GetTextLength(), "The end postion is invalid"
         initer = null_byte * (end - start + 1)
         buff = array.array("b", initer)

Pythonwin/pywin/tools/browser.py

@@ -45,11 +45,9 @@ def __eq__(self, other):
         return self.name == other.name
 
     def __repr__(self):
-        try:
-            type = self.GetHLIType()
-        except:
-            type = "Generic"
-        return f"HLIPythonObject({type}) - name: {self.name} object: {self.myobject!r}"
+        return (
+            f"{self.__class__.__name__}(name={self.name!r}, object={self.myobject!r})"
+        )
 
     def GetText(self):
         try:

Pythonwin/pywin/tools/hierlist.py

@@ -97,10 +97,10 @@ def HierInit(self, parent, listControl=None):  # Used when window first exists.
         else:
             self.listControl = listControl
             lbid = listControl.GetDlgCtrlID()
-            assert (
-                self.listBoxId is None or self.listBoxId == lbid
-            ), "An invalid listbox control ID has been specified (specified as {}, but exists as {})".format(
-                self.listBoxId, lbid
+            assert self.listBoxId is None or self.listBoxId == lbid, (
+                "An invalid listbox control ID has been specified (specified as {}, but exists as {})".format(
+                    self.listBoxId, lbid
+                )
             )
             self.listBoxId = lbid
         self.listControl.SetImageList(self.imageList, commctrl.LVSIL_NORMAL)