Merge branch 'main' into 3.13-support

Author: clin1234

CHANGES.txt

@@ -15,6 +15,31 @@ Coming in build 307, as yet unreleased
 --------------------------------------
 
 ### pywin32
+* Fixed accidentally trying to raise a `str` instead of an `Exception` in (#2270, @Avasam)
+  * `Pythonwin/pywin/debugger/debugger.py`
+  * `Pythonwin/pywin/framework/dlgappcore.py`
+  * `com/win32com/server/policy.py`
+  * `win32/Lib/regutil.py`
+  * `win32/scripts/VersionStamp/vssutil.py`
+* Removed the following unused symbols. They were meant to be used as Exceptions, but were accidentally strings (#2270, #2269, @Avasam)
+  * `pywin.debugger.debugger.error`
+  * `pywin.framework.dlgappcore.error`
+  * `win32com.server.policy.error`
+  * `regutil.error`
+  * `win32.scripts.VersionStamp.vssutil.error`
+  * `win32com.universal.com_error`
+  * `win32com.client.build.error`
+  * `win32com.client.genpy.error`
+* Add EnumDesktopWindows (#2219, @CristiFati)
+* Marked `exc_type` and `exc_traceback` in `win32comext.axscript.client.error.AXScriptException.__init__` as deprecated. (#2236 , @Avasam)
+  They are now unused and all information is taken from the `exc_value` parameter.
+* Fixed non-overriden `pywin.scintilla.formatter.Formatter.ColorizeString` raising `TypeError` instead of `RuntimeError` due to too many parameters (#2216, @Avasam)
+* Fixed broken since Python 3 tokenization in `win32comext.axdebug.codecontainer.pySourceCodeContainer.GetSyntaxColorAttributes` (#2216, @Avasam)
+* Fixed a `TypeError` due to incorrect kwargs in `win32comext.axscript.client.pydumper.Register` (#2216, @Avasam)
+* Fixed error reporting of file copy failure for for installing debug dlls (#2216, @Avasam)
+* Fixed `py.exe -m win32verstamp` command and other quote typos caused by Implied String Concatenation (#2225, @Avasam)
+* Fixed tons of quote-related typos in strings, docs and comments (#2271 , @Avasam)
+* Fixed VT_SAFEARRAY(VT_RECORD) which were missing the last element (#2247)
 * Fixed `MFC redist DLLs not found` by preferring corresponding version but accepting different version (#2248, @andreabravetti)
 * Fixed `pywintypes.error: (5, 'RegOpenKeyEx', 'Access is denied.')` when running service with debug parameter and no elevation (#2238, @jmartens)
 * Fixed handling of `SyntaxError` exception from a Windows Scripting Host Python Script on Python 3.10+ (#2235, @nbbeatty)

com/win32com/test/testPyComTest.py

@@ -625,10 +625,10 @@ def TestCounter(counter, bIsGenerated):
         counter.SetBounds(bounds[0], bounds[1])
 
     for item in counter:
-        num = num + 1
+        num += 1
     assert num == len(
         counter
-    ), "*** Length of counter and loop iterations dont match ***"
+    ), "*** Length of counter and loop iterations don't match ***"
     assert num == 10, "*** Unexpected number of loop iterations ***"
 
     try:
@@ -640,7 +640,7 @@ def TestCounter(counter, bIsGenerated):
     counter.Reset()
     num = 0
     for item in counter:
-        num = num + 1
+        num += 1
     assert num == 10, f"*** Unexpected number of loop iterations - got {num} ***"
     progress("Finished testing counter")
 

com/win32com/test/testvb.py

@@ -118,7 +118,7 @@ def TestVB(vbtest, bUseGenerated):
         assert (
             vbtest.VariantPutref._oleobj_ == vbtest._oleobj_
         ), "Could not set the VariantPutref property correctly."
-        # Cant test further types for this VariantPutref, as only
+        # Can't test further types for this VariantPutref, as only
         # COM objects can be stored ByRef.
 
         # A "set" type property - only works for generated.

com/win32comext/axscript/client/framework.py

@@ -1202,19 +1202,19 @@ def HandleException(self, codeBlock: AXScriptCodeBlock | None) -> NoReturn:
         # likely to have originated from the script code itself, and therefore
         # needs to be reported like any other exception.
         if IsCOMServerException(exc_type):
-            # Ensure the traceback doesnt cause a cycle.
+            # Ensure the traceback doesn't cause a cycle.
             raise
         # It could be an error by another script.
         if (
             isinstance(exc_value, pythoncom.com_error)
             and exc_value.hresult == axscript.SCRIPT_E_REPORTED
         ):
-            # Ensure the traceback doesnt cause a cycle.
+            # Ensure the traceback doesn't cause a cycle.
             raise COMException(scode=exc_value.hresult)
 
         exception = error.AXScriptException(self, codeBlock, exc_value=exc_value)
 
-        # Ensure the traceback doesnt cause a cycle.
+        # Ensure the traceback doesn't cause a cycle.
         result_exception = error.ProcessAXScriptException(
             self.scriptSite, self.debugManager, exception
         )

ruff.toml

@@ -4,6 +4,31 @@ target-version = "py37" # Target the oldest supported version
 select = [
   "I",   # isort
   "PLC", # Pylint Convention
+  "PLE", # Pylint Error
+  "RSE", # flake8-raise
+  "W", # pycodestyle Warning
+  "YTT", # flake8-2020
+
+  # String formatting, concatenating, interpolation, ...
+  "FLY", # static-join-to-f-string
+  "G", # flake8-logging-format
+  # Note, we still want to allow multiline ISC
+  "ISC001", # single-line-implicit-string-concatenation
+  "UP025", # Remove unicode literals from strings
+  "UP030", # Use implicit references for positional format fields
+  # TODO: Still lots of manual fixes needed
+  # "UP031", # Use format specifiers instead of percent format
+  # "UP032", # Use f-string instead of format call
+
+  # Ensure modern type annotation syntax and best practices
+  # Not including those covered by type-checkers
+  "FA", # flake8-future-annotations
+  "F404", # late-future-import
+  "PYI", # flake8-pyi
+  "UP006", # non-pep585-annotation
+  "UP007", # non-pep604-annotation
+  "UP010", # unnecessary-future-import
+  "UP037", # quoted-annotation
 ]
 
 [lint.per-file-ignores]
@@ -23,6 +48,3 @@ known-third-party = [
   "distutils",
 ]
 extra-standard-library = ["setuptools"]
-
-[lint.flake8-implicit-str-concat]
-allow-multiline = false # ignore ISC003 with this option disabled