Automatic cleanup of imports

.github/workflows/main.yml

@@ -91,10 +91,13 @@ jobs:
         path: |
           dist/*.whl
 
-  black:
+  checkers:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - run: pip install isort pycln
+      - run: pycln . --config=pycln.toml --check
+      - run: isort . --diff --check-only
       - uses: psf/black@stable
         with:
           options: "--fast --check --diff --verbose"

.isort.cfg

@@ -0,0 +1,6 @@
+[isort]
+py_version=37
+profile = black
+combine_as_imports = true
+# TODO: Decide if this is wanted:
+# combine_straight_imports = true

AutoDuck/BuildHHP.py

@@ -1,7 +1,7 @@
-import os
-import sys
 import glob
+import os
 import shutil
+import sys
 
 """
 BuildHHP.py

AutoDuck/Dump2HHC.py

@@ -1,7 +1,6 @@
+import copy
 import os
 import sys
-import pprint
-import copy
 
 """
 Dump2HHC.py

AutoDuck/InsertExternalOverviews.py

@@ -1,6 +1,5 @@
 import os
 import sys
-import string
 
 """
 Replace: <!--index:extopics-->

AutoDuck/TOCToHHK.py

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

AutoDuck/document_object.py

@@ -1,6 +1,4 @@
-import sys
-
-from xml.sax import make_parser, handler
+from xml.sax import handler, make_parser
 
 
 class categoryHandler(handler.ContentHandler):

AutoDuck/fixHelpCompression.py

@@ -1,6 +1,9 @@
 # fixHelpCompression.py
 # Add a compression option to the generated help project file.
-import sys, os, win32api
+import os
+import sys
+
+import win32api
 
 fname = sys.argv[1]
 

AutoDuck/makedfromi.py

@@ -1,4 +1,6 @@
-import sys, string, os, getopt
+import getopt
+import os
+import sys
 
 # Run this passing a ".i" file as param.  Will generate ".d"
 

AutoDuck/py2d.py

@@ -1,6 +1,6 @@
+import re
 import sys
 import types
-import re
 
 
 def ad_escape(s):

Pythonwin/Scintilla/src/LexGen.py

@@ -16,10 +16,10 @@
 # Does not regenerate the Visual C++ 6 project files but does the VS .NET
 # project file.
 
+import glob
+import os
 import string
 import sys
-import os
-import glob
 
 # EOL constants
 CR = "\r"

Pythonwin/pywin/Demos/app/basictimerapp.py

@@ -1,14 +1,14 @@
 # basictimerapp - a really simple timer application.
 # This should be run using the command line:
 # pythonwin /app demos\basictimerapp.py
-import win32ui
-import win32api
-import win32con
 import sys
-from pywin.framework import app, cmdline, dlgappcore, cmdline
-import timer
 import time
-import string
+
+import timer
+import win32api
+import win32con
+import win32ui
+from pywin.framework import app, cmdline, dlgappcore
 
 
 class TimerAppDialog(dlgappcore.AppDialog):

Pythonwin/pywin/Demos/app/customprint.py

@@ -5,12 +5,11 @@
 
 # This sample was contributed by Roger Burnham.
 
-from pywin.mfc import docview, dialog, afxres
-from pywin.framework import app
-
+import win32api
 import win32con
 import win32ui
-import win32api
+from pywin.framework import app
+from pywin.mfc import afxres, dialog, docview
 
 PRINTDLGORD = 1538
 IDC_PRINT_MAG_EDIT = 1010

Pythonwin/pywin/Demos/app/demoutils.py

@@ -1,6 +1,10 @@
 # Utilities for the demos
 
-import sys, win32api, win32con, win32ui
+import sys
+
+import win32api
+import win32con
+import win32ui
 
 NotScriptMsg = """\
 This demo program is not designed to be run as a Script, but is

Pythonwin/pywin/Demos/app/dlgappdemo.py

@@ -6,10 +6,11 @@
 # This module must be specified on the commandline to PythonWin only.
 # eg, PythonWin /app dlgappdemo.py
 
-from pywin.framework import dlgappcore, app
-import win32ui
 import sys
 
+import win32ui
+from pywin.framework import app, dlgappcore
+
 
 class TestDialogApp(dlgappcore.DialogApp):
     def CreateDialog(self):

Pythonwin/pywin/Demos/app/dojobapp.py

@@ -5,12 +5,11 @@
 # This should be run using the command line:
 # pythonwin /app demos\dojobapp.py
 
-import win32ui
+
 import win32api
 import win32con
-import sys
+import win32ui
 from pywin.framework import app, dlgappcore
-import string
 
 
 class DoJobAppDialog(dlgappcore.AppDialog):

Pythonwin/pywin/Demos/app/helloapp.py

@@ -14,7 +14,7 @@
 
 import win32con
 import win32ui
-from pywin.mfc import window, dialog, afxres
+from pywin.mfc import afxres, dialog, window
 from pywin.mfc.thread import WinApp
 
 

Pythonwin/pywin/Demos/cmdserver.py

@@ -2,14 +2,13 @@
 
 # Demo code that is not Pythonwin related, but too good to throw away...
 
-import win32api
+import _thread
 import sys
-from pywin.framework import winout
-
-import _thread, sys
-
 import traceback
 
+import win32api
+from pywin.framework import winout
+
 
 class ThreadWriter:
     "Assign an instance to sys.stdout for per-thread printing objects - Courtesy Guido!"

Pythonwin/pywin/Demos/createwin.py

@@ -7,10 +7,10 @@
 # 	the parameters to OnPaint are.
 #
 
-from pywin.mfc import dialog, window
-import win32ui
-import win32con
 import win32api
+import win32con
+import win32ui
+from pywin.mfc import dialog, window
 
 
 class Control(window.Wnd):

Pythonwin/pywin/Demos/demoutils.py

@@ -1,6 +1,10 @@
 # Utilities for the demos
 
-import sys, win32api, win32con, win32ui
+import sys
+
+import win32api
+import win32con
+import win32ui
 
 NotScriptMsg = """\
 This demo program is not designed to be run as a Script, but is

Pythonwin/pywin/Demos/dibdemo.py

@@ -1,10 +1,10 @@
 # A demo which creates a view and a frame which displays a PPM format bitmap
 #
 # This hasnnt been run in a while, as I dont have many of that format around!
-import win32ui
-import win32con
+
 import win32api
-import string
+import win32con
+import win32ui
 
 
 class DIBView:

Pythonwin/pywin/Demos/dlgtest.py

@@ -7,16 +7,11 @@
 #
 # ID's for the tabstop dialog - out test.
 #
-from win32ui import IDD_SET_TABSTOPS
-from win32ui import IDC_EDIT_TABS
-from win32ui import IDC_PROMPT_TABS
-from win32con import IDOK
-from win32con import IDCANCEL
-
-import win32ui
 import win32con
-
+import win32ui
 from pywin.mfc import dialog
+from win32con import IDCANCEL
+from win32ui import IDC_EDIT_TABS, IDC_PROMPT_TABS, IDD_SET_TABSTOPS
 
 
 class TestDialog(dialog.Dialog):

Pythonwin/pywin/Demos/dyndlg.py

@@ -19,8 +19,8 @@
 # 	Parameter 6 - Extra data
 
 
-import win32ui
 import win32con
+import win32ui
 from pywin.mfc import dialog, window
 
 

Pythonwin/pywin/Demos/fontdemo.py

@@ -10,13 +10,11 @@
 # >>> f2 = {'name':'Courier New', 'height':24, 'italic':1}
 # >>> d.SetFont (f2)
 
-import win32ui
-import win32con
 import win32api
-
+import win32con
+import win32ui
 from pywin.mfc import docview
 
-
 # font is a dictionary in which the following elements matter:
 # (the best matching font to supplied parameters is returned)
 #   name		string name of the font as known by Windows

Pythonwin/pywin/Demos/guidemo.py

@@ -1,9 +1,10 @@
 # GUI Demo - just a worker script to invoke all the other demo/test scripts.
-import win32ui
-import __main__
 import sys
+
+import __main__
 import regutil
 import win32api
+import win32ui
 
 demos = [  # 	('Font', 'import fontdemo;fontdemo.FontDemo()'),
     ("Open GL Demo", "import openGLDemo;openGLDemo.test()"),

Pythonwin/pywin/Demos/hiertest.py

@@ -1,9 +1,9 @@
-import win32ui
 import os
-import commctrl
 
-from pywin.tools import hierlist
+import commctrl
+import win32ui
 from pywin.mfc import docview, window
+from pywin.tools import hierlist
 
 
 # directory listbox

Pythonwin/pywin/Demos/menutest.py

@@ -1,6 +1,6 @@
 # Run this as a python script, to gray "close" off the edit window system menu.
-from pywin.framework import interact
 import win32con
+from pywin.framework import interact
 
 if __name__ == "__main__":
     import demoutils

Pythonwin/pywin/Demos/ocx/demoutils.py

@@ -1,6 +1,10 @@
 # Utilities for the demos
 
-import sys, win32api, win32con, win32ui
+import sys
+
+import win32api
+import win32con
+import win32ui
 
 NotScriptMsg = """\
 This demo program is not designed to be run as a Script, but is

Pythonwin/pywin/Demos/ocx/flash.py

@@ -7,11 +7,15 @@
 # Update to the path of the .swf file (note it could be a true URL)
 flash_url = "c:\\bounce.swf"
 
-import win32ui, win32con, win32api, regutil
-from pywin.mfc import window, activex
-from win32com.client import gencache
 import sys
 
+import regutil
+import win32api
+import win32con
+import win32ui
+from pywin.mfc import activex, window
+from win32com.client import gencache
+
 FlashModule = gencache.EnsureModule("{D27CDB6B-AE6D-11CF-96B8-444553540000}", 0, 1, 0)
 
 if FlashModule is None:

Pythonwin/pywin/Demos/ocx/msoffice.py

@@ -4,8 +4,11 @@
 # It is not comlpete yet, but it _does_ show an Excel spreadsheet in a frame!
 #
 
-import win32ui, win32uiole, win32con, regutil
-from pywin.mfc import window, activex, object, docview
+import regutil
+import win32con
+import win32ui
+import win32uiole
+from pywin.mfc import activex, docview, object, window
 from win32com.client import gencache
 
 # WordModule = gencache.EnsureModule('{00020905-0000-0000-C000-000000000046}', 1033, 8, 0)
@@ -132,7 +135,9 @@ def Create(self, title, rect=None, parent=None):
 
 
 def Demo():
-    import sys, win32api
+    import sys
+
+    import win32api
 
     docName = None
     if len(sys.argv) > 1:

Pythonwin/pywin/Demos/ocx/ocxserialtest.py

@@ -5,11 +5,12 @@
 
 # Very simple -  queries a modem for ATI responses
 
-import win32ui, win32uiole
+import pythoncom
 import win32con
-from pywin.mfc import dialog, activex
+import win32ui
+import win32uiole
+from pywin.mfc import activex, dialog
 from win32com.client import gencache
-import pythoncom
 
 SERIAL_SETTINGS = "19200,n,8,1"
 SERIAL_PORT = 2