pycln: cleanup of more imports

AutoDuck/TOCToHHK.py

@@ -1,4 +1,3 @@
-import os.path
 import sys
 
 """

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:

Pythonwin/pywin/framework/bitmap.py

@@ -5,8 +5,6 @@
 import win32ui
 from pywin.mfc import docview, window
 
-from . import app
-
 bStretch = 1
 
 

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):

Pythonwin/pywin/framework/editor/__init__.py

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

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

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

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
 
 

Pythonwin/pywin/framework/toolmenu.py

@@ -6,8 +6,6 @@
 import win32con
 import win32ui
 
-from . import app
-
 tools = {}
 idPos = 100
 

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

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,

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):

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

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

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:

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]
 

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(

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
 

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.

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

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

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
 

com/win32com/test/testAXScript.py

@@ -15,10 +15,9 @@ def setUp(self):
         file = win32api.GetFullPathName(
             os.path.join(next(iter(win32com.axscript.client.__path__)), "pyscript.py")
         )
-        from win32com.test.util import RegisterPythonServer
 
         self.verbose = verbose
-        RegisterPythonServer(file, "python", verbose=self.verbose)
+        win32com.test.util.RegisterPythonServer(file, "python", verbose=self.verbose)
 
     def testHost(self):
         file = win32api.GetFullPathName(

com/win32com/test/testDictionary.py

@@ -26,9 +26,10 @@ def TestDictAgainst(dict, check):
 # Ensure we have the correct version registered.
 def Register(quiet):
     import win32com.servers.dictionary
-    from win32com.test.util import RegisterPythonServer
 
-    RegisterPythonServer(win32com.servers.dictionary.__file__, "Python.Dictionary")
+    win32com.test.util.RegisterPythonServer(
+        win32com.servers.dictionary.__file__, "Python.Dictionary"
+    )
 
 
 def TestDict(quiet=None):

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:

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")

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()
 

com/win32com/test/testPyComTest.py

@@ -14,15 +14,15 @@
 import win32api
 import win32com
 import win32com.client.connect
+import win32com.test.util
 import win32timezone
 import winerror
 from win32com.client import VARIANT, CastTo, DispatchBaseClass, constants
-from win32com.test.util import RegisterPythonServer
 
 importMsg = "**** PyCOMTest is not installed ***\n  PyCOMTest is a Python test specific COM client and server.\n  It is likely this server is not installed on this machine\n  To install the server, you must get the win32com sources\n  and build it using MS Visual C++"
 
 # This test uses a Python implemented COM server - ensure correctly registered.
-RegisterPythonServer(
+win32com.test.util.RegisterPythonServer(
     os.path.join(os.path.dirname(__file__), "..", "servers", "test_pycomtest.py"),
     "Python.Test.PyCOMTest",
 )

com/win32com/test/testServers.py

@@ -16,9 +16,8 @@ class InterpCase(win32com.test.util.TestCase):
     def setUp(self):
         # Ensure the correct version registered.
         from win32com.servers import interp
-        from win32com.test.util import RegisterPythonServer
 
-        RegisterPythonServer(interp.__file__, "Python.Interpreter")
+        win32com.test.util.RegisterPythonServer(interp.__file__, "Python.Interpreter")
 
     def _testInterp(self, interp):
         self.assertEqual(interp.Eval("1+1"), 2)

com/win32com/test/testall.py

@@ -23,14 +23,13 @@
 
 import pythoncom
 import win32com.client
+from pywin32_testutil import TestLoader, TestRunner
 from win32com.test.util import (
     CapturingFunctionTestCase,
     CheckClean,
     RegisterPythonServer,
     ShellTestCase,
     TestCase,
-    TestLoader,
-    TestRunner,
 )
 
 verbosity = 1  # default unittest verbosity.