Update Ruff, replace pycln and simplify configs

.github/workflows/main.yml

@@ -152,17 +152,15 @@ jobs:
           python-version: "3.8"
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
-      - run: pip install clang-format==18.1.* pycln
+      - run: pip install clang-format==18.1.*
       # !cancelled(): Show issues even if the previous steps failed. But still fail the job
-      - run: pycln . --config=pycln.toml --check
       - name: Run Ruff linter
         uses: astral-sh/ruff-action@v3
         with:
-          version: "0.11.0"
+          version: "0.14.4"
         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/')

.pre-commit-config.yaml

@@ -19,14 +19,8 @@ repos:
         args: [--autofix, --indent, "2", --offset, "2", --preserve-quotes]
       - id: pretty-format-ini
         args: [--autofix]
-  - repo: https://github.com/hadialqattan/pycln
-    rev: v2.4.0
-    hooks:
-      - id: pycln
-        args: [--config=pycln.toml]
-        verbose: true
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.0
+    rev: v0.14.4
     hooks:
       - id: ruff # Run the linter.
         args: [--fix]

Pythonwin/pywin/framework/editor/__init__.py

@@ -100,6 +100,6 @@ def SetEditorFontOption(option, newValue):
     SetEditorOption(option, str(newValue))
 
 
-from pywin.framework.editor.color.coloreditor import (  # nopycln: import
+from pywin.framework.editor.color.coloreditor import (
     editorTemplate as editorTemplate,  # Adds doc template & Re-export
 )

Pythonwin/pywin/framework/interact.py

@@ -14,7 +14,7 @@
 import pywin.framework.app
 import pywin.scintilla.control
 import pywin.scintilla.formatter
-import pywin.scintilla.IDLEenvironment  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
+import pywin.scintilla.IDLEenvironment  # Injects fast_readline into the IDLE auto-indent extension
 import win32api
 import win32clipboard
 import win32con

Pythonwin/pywin/framework/intpydde.py

@@ -9,7 +9,7 @@
 import traceback
 
 import win32ui
-from dde import (  # nopycln: import # Re-exported for intpyapp.py
+from dde import (  # PLC0414: Re-exported for intpyapp.py
     CBF_FAIL_SELFCONNECTIONS as CBF_FAIL_SELFCONNECTIONS,  # noqa: PLC0414
     CreateConversation as CreateConversation,  # noqa: PLC0414
     CreateServer,

Pythonwin/pywin/scintilla/bindings.py

@@ -6,8 +6,9 @@
 import win32con
 import win32ui
 
-from . import (  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
-    IDLEenvironment,
+from . import (
+    # https://github.com/astral-sh/ruff/issues/15705
+    IDLEenvironment,  # noqa: F401 # Injects fast_readline into the IDLE auto-indent extension
 )
 
 HANDLER_ARGS_GUESS = 0

Pythonwin/pywin/scintilla/view.py

@@ -12,7 +12,7 @@
 from pywin.mfc import afxres, docview
 
 from . import (
-    IDLEenvironment,  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
+    IDLEenvironment,  # Injects fast_readline into the IDLE auto-indent extension
     bindings,
     control,
     scintillacon,

Pythonwin/pywin/test/test_pywin.py

@@ -375,7 +375,7 @@ def test_ia(self):
     def test_docedit(self):
         import tempfile
 
-        import pywin.scintilla.IDLEenvironment  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
+        import pywin.scintilla.IDLEenvironment  # Injects fast_readline into the IDLE auto-indent extension
 
         ##doc = pywin.framework.editor.editorTemplate.OpenDocumentFile(None)
         def t_print(*args):

adodbapi/__init__.py

@@ -1,4 +1,3 @@
-# nopycln: file # undecidable cases due to explicit re-exports https://github.com/hadialqattan/pycln/issues/205
 """adodbapi - A python DB API 2.0 (PEP 249) interface to Microsoft ADO
 
 Copyright (C) 2002 Henrik Ekelund, version 2.1 by Vernon Cole

adodbapi/adodbapi.py

@@ -1015,7 +1015,7 @@ def executemany(self, operation, seq_of_parameters):
 
             Return values are not defined.
         """
-        self.messages = list()
+        self.messages = []
         total_recordcount = 0
 
         self.prepare(operation)
@@ -1039,7 +1039,7 @@ def _fetch(self, limit=None):
             return
 
         if self.rs.State == adc.adStateClosed or self.rs.BOF or self.rs.EOF:
-            return list()
+            return []
         if limit:  # limit number of rows retrieved
             ado_results = self.rs.GetRows(limit)
         else:  # get all rows

adodbapi/apibase.py

@@ -563,7 +563,7 @@ def __next__(self):
             yield self._getValue(n)
 
     def __repr__(self):  # create a human readable representation
-        taglist = sorted(list(self.rows.columnNames.items()), key=lambda x: x[1])
+        taglist = sorted(self.rows.columnNames.items(), key=lambda x: x[1])
         s = "<SQLrow={"
         for name, i in taglist:
             s += f"{name}:{self._getValue(i)!r}, "

com/win32com/client/combrowse.py

@@ -188,8 +188,6 @@ def GetBitmapColumn(self):
 
 class HLIRegisteredTypeLibrary(HLICOM):
     def GetSubList(self):
-        import os
-
         clsidstr, versionStr = self.myobject
         collected = []
         helpPath = ""

com/win32com/client/makepy.py

@@ -152,8 +152,8 @@ def LogWarning(self, desc):
 
 class GUIProgress(SimpleProgress):
     def __init__(self, verboseLevel):
-        # Import some modules we need to we can trap failure now.
-        import pywin  # nopycln: import
+        # Import some modules we need so we can trap failure now.
+        import pywin  # noqa: F401
         import win32ui
 
         SimpleProgress.__init__(self, verboseLevel)

com/win32com/server/dispatcher.py

@@ -232,7 +232,7 @@ def _trace_(self, *args):
 
 
 try:
-    import win32trace  # nopycln: import # Check for win32traceutil w/o importing it
+    import win32trace  # noqa: F401 # Check for win32traceutil w/o importing it
 
     DefaultDebugDispatcher: type[DispatcherTrace] = DispatcherWin32trace
 except ImportError:  # no win32trace module - just use a print based one.

com/win32comext/adsi/__init__.py

@@ -25,7 +25,7 @@
 # interface, as well as via IDispatch.
 import pythoncom
 
-from .adsi import *  # nopycln: import # Re-export everything from win32comext/adsi/adsi.pyd
+from .adsi import *  # Re-export everything from win32comext/adsi/adsi.pyd
 
 LCID = 0
 

com/win32comext/adsi/demos/test.py

@@ -259,7 +259,7 @@ def main():
                     break
             else:
                 print("Test '%s' unknown - skipping" % arg)
-    if not len(dotests):
+    if not dotests:
         print("Nothing to do!")
         usage(tests)
     for test in dotests:

com/win32comext/mapi/emsabtags.py

@@ -1,4 +1,4 @@
-# nopycln: file # Re-exporting many constants
+# ruff: noqa: F401 # Re-exporting many constants
 # Converted "manually" from EMSABTAG.H
 from .mapitags import (
     PROP_TAG,

com/win32comext/propsys/test/testpropsys.py

@@ -1,4 +1,4 @@
-from win32com.propsys import propsys, pscon  # nopycln: import
+from win32com.propsys import propsys, pscon
 
 print("propsys was imported (sorry - that is the extent of the tests,")
 print("but see the shell folder_view demo, which uses this module)")

ruff.toml

@@ -1,4 +1,4 @@
-target-version = "py38" # Target the oldest supported version in editors and default CLI
+target-version = "py38" # Target the oldest supported version
 # This file is not UTF-8
 extend-exclude = ["Pythonwin/pywin/test/_dbgscript.py"]
 
@@ -9,6 +9,7 @@ line-ending = "cr-lf"
 select = [
   "B028", # no-explicit-stacklevel
   "C4", # flake8-comprehensions
+  "F401", # unused-import
   "F811", # redefined-while-unused
   "I", # isort
   "PLC", # Pylint Convention
@@ -20,42 +21,45 @@ select = [
   # String formatting, concatenating, interpolation, ...
   "FLY", # static-join-to-f-string
   "G", # flake8-logging-format
-  # Note, we still want to allow multiline ISC
-  "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 or exclusive to Python 3.11+
   "FA", # flake8-future-annotations
   "F404", # late-future-import
   "PYI", # flake8-pyi
-  "UP006", # non-pep585-annotation
-  "UP007", # non-pep604-annotation
-  "UP010", # unnecessary-future-import
-  "UP035", # deprecated-import
-  "UP037", # quoted-annotation
-  "UP043", # unnecessary-default-type-args
+
+  # Code modernization (strings, annotations, conditions, ...)
+  "UP", # pyupgrade
 
   # Helps prevent circular imports and other unneeded imports
   "TC", # flake8-type-checking
 ]
-
 extend-ignore = [
-  # TODO: Consider passing exception around to ensure methods are only ever used within exception handlers
-  "PLE0704", # misplaced-bare-raise
-
+  # We prefer explicit open mode parameter
+  "UP015", # redundant-open-modes
   # No such concerns for stdlib
   "TC003", # typing-only-standard-library-import
+  # Lots of lazy or side-effect imports
+  "PLC0415", # import-outside-top-level
+  # TODO: Consider passing exception around to ensure methods are only ever used within exception handlers
+  "PLE0704", # misplaced-bare-raise
+  # TODO: Still lots of manual fixes needed
+  "UP031", # Use format specifiers instead of percent format
+  "UP032", # Use f-string instead of format call
 ]
 
-[lint.per-file-ignores]
-# Explicit re-exports is fine in __init__.py, still a code smell elsewhere.
-"__init__.py" = ["PLC0414"]
-# TODO: Make adodbapi changes in their own PRs
-"adodbapi/*" = ["C4", "YTT301", "UP031", "UP032"]
+[lint.pyflakes]
+allowed-unused-imports = [
+  # Modules with known side-effects
+  "coloreditor", # Adds doc template
+  "IDLEenvironment", # Injects fast_readline into the IDLE auto-indent extension
+  "pythoncom", # pythoncomXX.dll loader
+  "pywintypes", # pywintypesXX.dll loader
+  "win32com", # Sets pythoncom.frozen and adds modules to path based on the registry
+  "win32traceutil", # Redirects output to win32trace remote collector
+  "win32ui", # Must always be imported before dde
+  # Note: com/win32com/client/gencache.py does read files on import, but only to fill in it's own dicts from cache
+]
 
 [lint.isort]
 combine-as-imports = true

win32/Demos/service/pipeTestService.py

@@ -24,11 +24,11 @@
 
 # # Use "import *" to keep this looking as much as a "normal" service
 # as possible.  Real code shouldn't do this.
-from ntsecuritycon import *  # nopycln: import
-from win32api import *  # nopycln: import
-from win32event import *  # nopycln: import
-from win32file import *  # nopycln: import
-from win32pipe import *  # nopycln: import
+from ntsecuritycon import *
+from win32api import *
+from win32event import *
+from win32file import *
+from win32pipe import *
 
 
 def ApplyIgnoreError(fn, args):

win32/Demos/service/pipeTestServiceClient.py

@@ -16,9 +16,9 @@
 
 # # Use "import *" to keep this looking as much as a "normal" service
 # as possible.  Real code shouldn't do this.
-from win32event import *  # nopycln: import
-from win32file import *  # nopycln: import
-from win32pipe import *  # nopycln: import
+from win32event import *
+from win32file import *
+from win32pipe import *
 
 verbose = 0
 

win32/Demos/win32netdemo.py

@@ -257,7 +257,7 @@ def main():
                     break
             else:
                 print("Test '%s' unknown - skipping" % arg)
-    if not len(dotests):
+    if not dotests:
         print("Nothing to do!")
         usage(tests)
     for test in dotests:

win32/Lib/win2kras.py

@@ -9,6 +9,6 @@
 
 import warnings
 
-from win32ras import *  # nopycln: import
+from win32ras import *
 
 warnings.warn(str(__doc__), category=DeprecationWarning, stacklevel=2)

win32/Lib/winxptheme.py

@@ -5,4 +5,4 @@
 around _winxptheme.
 """
 
-from _winxptheme import *  # nopycln: import
+from _winxptheme import *

win32/scripts/h2py.py

@@ -180,7 +180,7 @@ def process(fp, outfp, env={}):
                     try:
                         inclfp = open(dir + "/" + filename)
                         break
-                    except IOError:
+                    except OSError:
                         pass
                 if inclfp:
                     with inclfp:

win32/scripts/regsetup.py

@@ -162,9 +162,6 @@ def FindPythonExe(exeAlias, possibleRealNames, searchPaths):
 
 def QuotedFileName(fname):
     """Given a filename, return a quoted version if necessary"""
-
-    import regutil
-
     try:
         fname.index(" ")  # Other chars forcing quote?
         return '"%s"' % fname
@@ -183,8 +180,6 @@ def LocateFileName(fileNamesString, searchPaths):
     """
     import os
 
-    import regutil
-
     fileNames = fileNamesString.split(";")
     for path in searchPaths:
         for fileName in fileNames:

win32/test/testall.py

@@ -106,8 +106,6 @@ def __call__(self):
 
 
 def get_demo_tests():
-    import win32api
-
     ret = []
     demo_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "Demos"))
     assert os.path.isdir(demo_dir), demo_dir

win32/winxpgui.py

@@ -5,9 +5,9 @@
 
 import warnings
 
-from win32console import (  # nopycln: import
+from win32console import (
     GetConsoleWindow as GetConsoleWindow,  # noqa: PLC0414 # Explicit re-export
 )
-from win32gui import *  # nopycln: import
+from win32gui import *
 
 warnings.warn(str(__doc__), category=DeprecationWarning, stacklevel=2)