Extract "remove unused imports" from mhammond#2102

Pythonwin/pywin/Demos/app/helloapp.py

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

Pythonwin/pywin/framework/editor/color/coloreditor.py

@@ -5,13 +5,7 @@
 import win32api
 import win32con
 import win32ui
-from pywin.framework.editor import (
-    GetEditorFontOption,
-    GetEditorOption,
-    SetEditorFontOption,
-    SetEditorOption,
-    defaultCharacterFormat,
-)
+from pywin.framework.editor import GetEditorOption
 from pywin.scintilla import bindings
 
 # from pywin.framework.editor import EditorPropertyPage

Pythonwin/pywin/framework/editor/configui.py

@@ -2,15 +2,7 @@
 import win32api
 import win32con
 import win32ui
-from pywin.framework.editor import (
-    DeleteEditorOption,
-    GetEditorFontOption,
-    GetEditorOption,
-    SetEditorFontOption,
-    SetEditorOption,
-    defaultCharacterFormat,
-    editorTemplate,
-)
+from pywin.framework.editor import DeleteEditorOption, GetEditorOption, SetEditorOption
 from pywin.mfc import dialog
 
 from . import document
@@ -119,7 +111,6 @@ def OnInitDialog(self):
             import traceback
 
             traceback.print_exc()
-            pass
 
         self.HookCommand(self.OnButSimple, win32ui.IDC_FOLD_ENABLE)
         self.HookCommand(self.OnButSimple, win32ui.IDC_RADIO1)

Pythonwin/pywin/framework/editor/editor.py

@@ -26,11 +26,9 @@
 from pywin.framework.editor import (
     GetEditorFontOption,
     GetEditorOption,
-    SetEditorFontOption,
-    SetEditorOption,
     defaultCharacterFormat,
 )
-from pywin.mfc import afxres, dialog, docview
+from pywin.mfc import afxres, docview
 
 patImport = regex.symcomp(r"import \(<name>.*\)")
 patIndent = regex.compile(r"^\([ \t]*[~ \t]\)")

Pythonwin/pywin/framework/winout.py

@@ -23,17 +23,21 @@
 import queue
 import re
 
+import pywin.scintilla.document
 import win32api
 import win32con
 import win32ui
 from pywin.framework import app, window
 from pywin.mfc import docview
+from pywin.scintilla import scintillacon
 
 debug = lambda msg: None
-
-##debug=win32ui.OutputDebugString
-##import win32trace;win32trace.InitWrite() # for debugging - delete me!
-##debug = win32trace.write
+# debug=win32ui.OutputDebugString
+# import win32trace;win32trace.InitWrite() # for debugging - delete me!
+# debug = win32trace.write
+# WindowOutputDocumentParent=docview.RichEditDoc
+# WindowOutputDocumentParent=docview.Document
+WindowOutputDocumentParent = pywin.scintilla.document.CScintillaDocument
 
 
 class flags:
@@ -43,15 +47,6 @@ class flags:
     WQ_IDLE = 2
 
 
-# WindowOutputDocumentParent=docview.RichEditDoc
-# WindowOutputDocumentParent=docview.Document
-import pywin.scintilla.document
-from pywin import default_scintilla_encoding
-from pywin.scintilla import scintillacon
-
-WindowOutputDocumentParent = pywin.scintilla.document.CScintillaDocument
-
-
 class WindowOutputDocument(WindowOutputDocumentParent):
     def SaveModified(self):
         return 1  # say it is OK to destroy my document

Pythonwin/pywin/tools/regpy.py

@@ -1,8 +1,8 @@
 # (sort-of) Registry editor
 import commctrl
-import dialog
 import win32con
 import win32ui
+from pywin.mfc import dialog
 
 
 class RegistryControl:

com/win32comext/axdebug/Test/host.py

@@ -5,10 +5,8 @@
 import win32api
 import win32com.server.util
 import winerror
-from win32com.axdebug import adb, axdebug, codecontainer, contexts, documents, gateways
-from win32com.axdebug.util import _wrap, _wrap_remove, trace
-from win32com.axscript import axscript
-from win32com.client.util import Enumerator
+from win32com.axdebug import adb, axdebug, codecontainer, gateways
+from win32com.axdebug.util import trace
 from win32com.server.exception import Exception
 
 

com/win32comext/axdebug/contexts.py

@@ -7,7 +7,7 @@
 from . import adb, axdebug, gateways
 
 # Utility function for wrapping object created by this module.
-from .util import _wrap, _wrap_remove, trace
+from .util import _wrap
 
 
 class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext):

com/win32comext/axdebug/debugger.py

@@ -13,7 +13,7 @@
     expressions,
     gateways,
 )
-from win32com.axdebug.util import _wrap, _wrap_remove, trace
+from win32com.axdebug.util import _wrap
 from win32com.axscript import axscript
 
 currentDebugger = None

com/win32comext/axdebug/documents.py

@@ -7,8 +7,8 @@
 from win32com.server.exception import Exception
 from win32com.server.util import unwrap
 
-from . import axdebug, codecontainer, contexts, gateways
-from .util import RaiseNotImpl, _wrap, _wrap_remove, trace
+from . import axdebug, gateways
+from .util import _wrap, trace
 
 # def trace(*args):
 #       pass

com/win32comext/axdebug/expressions.py

@@ -8,7 +8,7 @@
 from win32com.server.exception import COMException
 
 from . import axdebug, gateways
-from .util import RaiseNotImpl, _wrap, _wrap_remove
+from .util import RaiseNotImpl, _wrap
 
 
 # Given an object, return a nice string

com/win32comext/axscript/client/debug.py

@@ -3,10 +3,9 @@
 
 import pythoncom
 import win32api
-import win32com.client.connect
 import win32com.server.util
 import winerror
-from win32com.axdebug import adb, axdebug, contexts, documents, gateways, stackframe
+from win32com.axdebug import adb, axdebug, documents, gateways
 from win32com.axdebug.codecontainer import SourceCodeContainer
 from win32com.axdebug.util import _wrap, _wrap_remove
 from win32com.client.util import Enumerator

isapi/test/extension_simple.py

@@ -6,17 +6,12 @@
 # This will execute the method 'test1' below.  See below for the list of
 # test methods that are acceptable.
 
-import urllib.error
-import urllib.parse
-import urllib.request
-
 # If we have no console (eg, am running from inside IIS), redirect output
 # somewhere useful - in this case, the standard win32 trace collector.
 import win32api
 import winerror
 
-from isapi import ExtensionError, isapicon, threaded_extension
-from isapi.simple import SimpleFilter
+from isapi import ExtensionError, threaded_extension
 
 try:
     win32api.GetConsoleTitle()