pycln: automatic cleanup of more imports

mhammond · Jul 28, 2024 · b0490f2 · b0490f2
1 parent 377a3ef
commit b0490f2
Show file tree

Hide file tree

Showing 58 changed files with 159 additions and 165 deletions.
diff --git a/AutoDuck/TOCToHHK.py b/AutoDuck/TOCToHHK.py
@@ -1,4 +1,3 @@
-import os.path
 import sys
 
 """

diff --git a/Pythonwin/pywin/Demos/guidemo.py b/Pythonwin/pywin/Demos/guidemo.py
@@ -2,11 +2,11 @@
 import sys
 
 import __main__
-import regutil
 import win32api
 import win32ui
 
-demos = [  # 	('Font', 'import fontdemo;fontdemo.FontDemo()'),
+demos = [
+    # ("Font", "import fontdemo;fontdemo.FontDemo()"),
     ("Open GL Demo", "import openGLDemo;openGLDemo.test()"),
     ("Threaded GUI", "import threadedgui;threadedgui.ThreadedDemo()"),
     ("Tree View Demo", "import hiertest;hiertest.demoboth()"),
@@ -26,30 +26,28 @@
 
 
 def demo():
-    try:
-        # seeif I can locate the demo files.
-        import fontdemo
-    except ImportError:
-        # else put the demos direectory on the path (if not already)
-        try:
-            instPath = regutil.GetRegistryDefaultValue(
-                regutil.BuildDefaultPythonKey() + "\\InstallPath"
-            )
-        except win32api.error:
-            print(
-                "The InstallPath can not be located, and the Demos directory is not on the path"
-            )
-            instPath = "."
-
-        demosDir = win32ui.FullPath(instPath + "\\Demos")
-        for path in sys.path:
-            if win32ui.FullPath(path) == demosDir:
-                break
-        else:
-            sys.path.append(demosDir)
-        import fontdemo
+    # try:
+    #     # seeif I can locate the demo files.
+    #     import fontdemo
+    # except ImportError:
+    #     # else put the demos direectory on the path (if not already)
+    #     try:
+    #         instPath = regutil.GetRegistryDefaultValue(
+    #             regutil.BuildDefaultPythonKey() + "\\InstallPath"
+    #         )
+    #     except win32api.error:
+    #         print(
+    #             "The InstallPath can not be located, and the Demos directory is not on the path"
+    #         )
+    #         instPath = "."
 
-    import sys
+    #     demosDir = win32ui.FullPath(instPath + "\\Demos")
+    #     for path in sys.path:
+    #         if win32ui.FullPath(path) == demosDir:
+    #             break
+    #     else:
+    #         sys.path.append(demosDir)
+    #     import fontdemo
 
     if "/go" in sys.argv:
         for name, cmd in demos:

diff --git a/Pythonwin/pywin/framework/bitmap.py b/Pythonwin/pywin/framework/bitmap.py
@@ -5,8 +5,6 @@
 import win32ui
 from pywin.mfc import docview, window
 
-from . import app
-
 bStretch = 1
 
 

diff --git a/Pythonwin/pywin/framework/editor/ModuleBrowser.py b/Pythonwin/pywin/framework/editor/ModuleBrowser.py
@@ -8,7 +8,7 @@
 import win32con
 import win32ui
 from pywin.mfc import afxres
-from pywin.tools import browser, hierlist
+from pywin.tools import hierlist
 
 
 class HierListCLBRModule(hierlist.HierListItem):

diff --git a/Pythonwin/pywin/framework/editor/__init__.py b/Pythonwin/pywin/framework/editor/__init__.py
@@ -100,4 +100,4 @@ def SetEditorFontOption(option, newValue):
     SetEditorOption(option, str(newValue))
 
 
-from pywin.framework.editor.color.coloreditor import editorTemplate
+import pywin.framework.editor.color.coloreditor  # nopycln: import # Adds doc template
diff --git a/Pythonwin/pywin/framework/editor/document.py b/Pythonwin/pywin/framework/editor/document.py
@@ -8,7 +8,6 @@
 import win32con
 import win32ui
 from pywin.framework.editor import GetEditorOption
-from pywin.mfc import docview, object
 
 BAK_NONE = 0
 BAK_DOT_BAK = 1

diff --git a/Pythonwin/pywin/framework/interact.py b/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
+import pywin.scintilla.IDLEenvironment  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
 import win32api
 import win32clipboard
 import win32con

diff --git a/Pythonwin/pywin/framework/intpydde.py b/Pythonwin/pywin/framework/intpydde.py
@@ -10,7 +10,13 @@
 
 import win32api
 import win32ui
-from dde import *
+from dde import (  # nopycln: import # Re-exported for intpyapp.py
+    CBF_FAIL_SELFCONNECTIONS as CBF_FAIL_SELFCONNECTIONS,  # noqa: PLC0414
+    CreateConversation as CreateConversation,  # noqa: PLC0414
+    CreateServer,
+    CreateServerSystemTopic,
+    error as error,  # noqa: PLC0414
+)
 from pywin.mfc import object
 
 

diff --git a/Pythonwin/pywin/framework/toolmenu.py b/Pythonwin/pywin/framework/toolmenu.py
@@ -6,8 +6,6 @@
 import win32con
 import win32ui
 
-from . import app
-
 tools = {}
 idPos = 100
 

diff --git a/Pythonwin/pywin/scintilla/bindings.py b/Pythonwin/pywin/scintilla/bindings.py
@@ -6,7 +6,9 @@
 import win32con
 import win32ui
 
-from . import IDLEenvironment, keycodes
+from . import (  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
+    IDLEenvironment,
+)
 
 HANDLER_ARGS_GUESS = 0
 HANDLER_ARGS_NATIVE = 1

diff --git a/Pythonwin/pywin/scintilla/view.py b/Pythonwin/pywin/scintilla/view.py
@@ -12,7 +12,7 @@
 from pywin.mfc import afxres, docview
 
 from . import (
-    IDLEenvironment,  # IDLE emulation.
+    IDLEenvironment,  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
     bindings,
     control,
     scintillacon,

diff --git a/Pythonwin/pywin/test/test_pywin.py b/Pythonwin/pywin/test/test_pywin.py
@@ -376,7 +376,7 @@ def test_ia(self):
     def test_docedit(self):
         import tempfile
 
-        import pywin.scintilla.IDLEenvironment
+        import pywin.scintilla.IDLEenvironment  # nopycln: import # Injects fast_readline into the IDLE auto-indent extension
 
         ##doc = pywin.framework.editor.editorTemplate.OpenDocumentFile(None)
         def t_print(*args):

diff --git a/adodbapi/__init__.py b/adodbapi/__init__.py
@@ -1,3 +1,4 @@
+# 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

diff --git a/adodbapi/test/adodbapitest.py b/adodbapi/test/adodbapitest.py
@@ -33,7 +33,6 @@
 
 import adodbapitestconfig as config  # run the configuration module. # will set sys.path to find correct version of adodbapi
 import tryconnection  # in our code below, all our switches are from config.whatever
-import win32com.client
 
 import adodbapi
 import adodbapi.apibase as api

diff --git a/com/win32com/client/combrowse.py b/com/win32com/client/combrowse.py
@@ -93,8 +93,6 @@ def CalculateIsExpandable(self):
             rc = 0
         return rc
 
-    pass
-
 
 class HLI_IEnumMoniker(HLI_Enum):
     def GetSubList(self):
@@ -595,7 +593,6 @@ def GetSubList(self):
 
 
 def main(modal=True, mdi=False):
-    from pywin.tools import hierlist
 
     root = HLIRoot("COM Browser")
     if mdi and "pywin.framework.app" in sys.modules:

diff --git a/com/win32com/client/util.py b/com/win32com/client/util.py
@@ -5,7 +5,7 @@
 """
 
 import pythoncom
-from win32com.client import Dispatch, _get_good_object_
+from win32com.client import _get_good_object_
 
 PyIDispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch]
 

diff --git a/com/win32com/demos/excelAddin.py b/com/win32com/demos/excelAddin.py
@@ -50,7 +50,7 @@
 
 import pythoncom
 from win32com import universal
-from win32com.client import Dispatch, DispatchWithEvents, constants, gencache
+from win32com.client import DispatchWithEvents, constants, gencache
 
 # Support for COM objects we use.
 gencache.EnsureModule(

diff --git a/com/win32com/demos/iebutton.py b/com/win32com/demos/iebutton.py
@@ -30,8 +30,6 @@
 import win32api
 import win32com
 import win32com.server.register
-from win32com import universal
-from win32com.client import Dispatch, DispatchWithEvents, constants, gencache, getevents
 
 # This demo uses 'print' - use win32traceutil to see it if we have no
 # console.
@@ -40,7 +38,6 @@
 except win32api.error:
     import win32traceutil
 
-import array
 
 from win32com.axcontrol import axcontrol
 

diff --git a/com/win32com/server/dispatcher.py b/com/win32com/server/dispatcher.py
@@ -295,7 +295,7 @@ def _HandleException_(self):
 
 
 try:
-    import win32trace
+    import win32trace  # nopycln: import # Check for win32traceutil w/o importing it
 
     DefaultDebugDispatcher: type[DispatcherTrace] = DispatcherWin32trace
 except ImportError:  # no win32trace module - just use a print based one.

diff --git a/com/win32com/server/policy.py b/com/win32com/server/policy.py
@@ -66,8 +66,6 @@
  problem, rather than a COM error.
 """
 
-__author__ = "Greg Stein and Mark Hammond"
-
 import sys
 import types
 
@@ -92,6 +90,8 @@
 
 from .exception import COMException
 
+__author__ = "Greg Stein and Mark Hammond"
+
 S_OK = 0
 
 # Few more globals to speed things.
@@ -812,6 +812,9 @@ def _import_module(mname):
 # These have been moved to a new source file, but some code may
 # still reference them here.  These will end up being removed.
 try:
-    from .dispatcher import DispatcherTrace, DispatcherWin32trace
+    from .dispatcher import (  # nopycln: import
+        DispatcherTrace as DispatcherTrace,  # noqa: PLC0414 # Explicit re-export of unused symbol
+        DispatcherWin32trace as DispatcherWin32trace,  # noqa: PLC0414 # Explicit re-export of unused symbol
+    )
 except ImportError:  # Quite likely a frozen executable that doesn't need dispatchers
     pass
diff --git a/com/win32com/servers/test_pycomtest.py b/com/win32com/servers/test_pycomtest.py
@@ -6,7 +6,6 @@
 import winerror
 
 # Ensure the vtables in the tlb are known.
-from win32com import universal
 from win32com.client import constants, gencache
 from win32com.server.exception import COMException
 from win32com.server.util import wrap

diff --git a/com/win32com/test/testADOEvents.py b/com/win32com/test/testADOEvents.py
@@ -2,7 +2,7 @@
 import time
 
 import pythoncom
-from win32com.client import Dispatch, DispatchWithEvents, constants
+from win32com.client import DispatchWithEvents, constants
 
 finished = 0  # Flag for the wait loop from (3) to test
 

diff --git a/com/win32com/test/testExchange.py b/com/win32com/test/testExchange.py
@@ -6,7 +6,7 @@
 import os
 
 import pythoncom
-from win32com.client import constants, gencache
+from win32com.client import gencache
 
 ammodule = None  # was the generated module!
 
@@ -94,7 +94,6 @@ def TestUser(session):
 
 
 def test():
-    import win32com.client
 
     oldcwd = os.getcwd()
     try:

diff --git a/com/win32com/test/testMSOffice.py b/com/win32com/test/testMSOffice.py
@@ -182,7 +182,7 @@ def TestAll():
         traceback.print_exc()
 
     try:
-        import xl5en32
+        import xl5en32  # nopycln: import # Test import. TODO: Is testing Excel 95 still relevant ?
 
         mod = gencache.EnsureModule("{00020813-0000-0000-C000-000000000046}", 9, 1, 0)
         xl = win32com.client.Dispatch("Excel.Application.5")

diff --git a/com/win32com/test/testMSOfficeEvents.py b/com/win32com/test/testMSOfficeEvents.py
@@ -6,7 +6,7 @@
 import types
 
 import pythoncom
-from win32com.client import Dispatch, DispatchWithEvents
+from win32com.client import DispatchWithEvents
 
 stopEvent = threading.Event()
 

diff --git a/com/win32com/test/util.py b/com/win32com/test/util.py
@@ -1,4 +1,3 @@
-import gc
 import logging
 import os
 import sys
@@ -13,7 +12,7 @@
 import win32com
 import winerror
 from pythoncom import _GetGatewayCount, _GetInterfaceCount
-from pywin32_testutil import LeakTestCase, TestLoader, TestResult, TestRunner
+from pywin32_testutil import LeakTestCase
 
 
 def CheckClean():

diff --git a/com/win32comext/authorization/demos/EditSecurity.py b/com/win32comext/authorization/demos/EditSecurity.py
@@ -1,6 +1,5 @@
 import os
 
-import ntsecuritycon
 import pythoncom
 import win32api
 import win32com.server.policy
@@ -12,43 +11,21 @@
     FILE_GENERIC_EXECUTE,
     FILE_GENERIC_READ,
     FILE_GENERIC_WRITE,
-    FILE_READ_ATTRIBUTES,
-    FILE_READ_DATA,
-    FILE_READ_EA,
-    FILE_WRITE_ATTRIBUTES,
     FILE_WRITE_DATA,
-    FILE_WRITE_EA,
-    PSPCB_SI_INITDIALOG,
     READ_CONTROL,
-    SI_ACCESS_CONTAINER,
     SI_ACCESS_GENERAL,
-    SI_ACCESS_PROPERTY,
     SI_ACCESS_SPECIFIC,
     SI_ADVANCED,
     SI_CONTAINER,
     SI_EDIT_ALL,
-    SI_EDIT_AUDITS,
-    SI_EDIT_PROPERTIES,
-    SI_PAGE_ADVPERM,
-    SI_PAGE_AUDIT,
-    SI_PAGE_OWNER,
-    SI_PAGE_PERM,
     SI_PAGE_TITLE,
     SI_RESET,
-    STANDARD_RIGHTS_EXECUTE,
-    STANDARD_RIGHTS_READ,
-    STANDARD_RIGHTS_WRITE,
-    SYNCHRONIZE,
     WRITE_DAC,
     WRITE_OWNER,
 )
 from pythoncom import IID_NULL
 from win32com.authorization import authorization
-from win32com.shell.shellcon import (  # # Msg parameter to PropertySheetPageCallback
-    PSPCB_CREATE,
-    PSPCB_RELEASE,
-)
-from win32security import CONTAINER_INHERIT_ACE, INHERIT_ONLY_ACE, OBJECT_INHERIT_ACE
+from win32security import CONTAINER_INHERIT_ACE, OBJECT_INHERIT_ACE
 
 
 class SecurityInformation(win32com.server.policy.DesignatedWrapPolicy):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,4 +100,4 @@ def SetEditorFontOption(option, newValue):
		SetEditorOption(option, str(newValue))


		from pywin.framework.editor.color.coloreditor import editorTemplate
		import pywin.framework.editor.color.coloreditor # nopycln: import # Adds doc template