Revert sorting and organizing imports. leave that to #1986

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/debugger/debugger.py

@@ -8,23 +8,23 @@
 # >>> import pywin.debugger
 # >>> pywin.debugger.GetDebugger().run("command")
 
-import bdb
-import os
 import pdb
-import string
+import bdb
 import sys
-import traceback
+import string
+import os
 import types
 
-import commctrl
-import pywin.docking.DockingBar
+import win32ui
 import win32api
 import win32con
-import win32ui
-from pywin.framework import app, editor, interact, scriptutils
-from pywin.framework.editor.color.coloreditor import MARKER_BREAKPOINT, MARKER_CURRENT
-from pywin.mfc import afxres, dialog, object, window
+import pywin.docking.DockingBar
+from pywin.mfc import dialog, object, afxres, window
+from pywin.framework import app, interact, editor, scriptutils
+from pywin.framework.editor.color.coloreditor import MARKER_CURRENT, MARKER_BREAKPOINT
 from pywin.tools import browser, hierlist
+import commctrl
+import traceback
 
 # import win32traceutil
 LVN_ENDLABELEDIT = commctrl.LVN_ENDLABELEDITW

Pythonwin/pywin/framework/app.py

@@ -4,17 +4,16 @@
 #
 # We also grab the FileOpen command, to invoke our Python editor
 " The PythonWin application code. Manages most aspects of MDI, etc "
-import os
-import string
-import sys
-import traceback
-
-import regutil
-import win32api
 import win32con
+import win32api
 import win32ui
-from pywin.mfc import afxres, dialog, window
+import sys
+import string
+import os
+from pywin.mfc import window, dialog, afxres
 from pywin.mfc.thread import WinApp
+import traceback
+import regutil
 
 from . import scriptutils
 

Pythonwin/pywin/framework/editor/editor.py

@@ -17,23 +17,23 @@
 # Note that it will _always_ prompt you if the file in the editor has been modified.
 
 
-import os
+import win32ui
+import win32api
+import win32con
+import regex
 import re
 import string
+import sys, os
 import traceback
+from pywin.mfc import docview, dialog, afxres
 
-import regex
-import win32api
-import win32con
-import win32ui
 from pywin.framework.editor import (
-    GetEditorFontOption,
     GetEditorOption,
-    SetEditorFontOption,
     SetEditorOption,
+    GetEditorFontOption,
+    SetEditorFontOption,
     defaultCharacterFormat,
 )
-from pywin.mfc import afxres, dialog, docview
 
 patImport = regex.symcomp(r"import \(<name>.*\)")
 patIndent = regex.compile(r"^\\([ \t]*[~ \t]\\)")

Pythonwin/pywin/framework/interact.py

@@ -3,34 +3,34 @@
 ## Interactive Shell Window
 ##
 
-import array
+import sys, os
 import code
-import os
 import string
-import sys
-import traceback
 
-import __main__
-import afxres
-import pywin.framework.app
-import pywin.scintilla.control
-import pywin.scintilla.formatter
-import pywin.scintilla.IDLEenvironment
+import win32ui
 import win32api
 import win32clipboard
 import win32con
-import win32ui
+import traceback
+import afxres
+import array
+import __main__
+
+import pywin.scintilla.formatter
+import pywin.scintilla.control
+import pywin.scintilla.IDLEenvironment
+import pywin.framework.app
 
 ## sequential after ID_GOTO_LINE defined in editor.py
 ID_EDIT_COPY_CODE = 0xE2002
 ID_EDIT_EXEC_CLIPBOARD = 0x2003
 
 trace = pywin.scintilla.formatter.trace
 
-import re
-
 from . import winout
 
+import re
+
 # from IDLE.
 _is_block_opener = re.compile(r":\s*(#.*)?$").search
 _is_block_closer = re.compile(

Pythonwin/pywin/framework/mdi_pychecker.py

@@ -33,19 +33,11 @@
 ##
 ######################################################################
 
-import glob
-import os
-import re
-import stat
-import string
-import sys
-import time
-
+import win32ui
 import win32api
+from pywin.mfc import docview, dialog, window
 import win32con
-import win32ui
-from pywin.mfc import dialog, docview, window
-
+import sys, string, re, glob, os, stat, time
 from . import scriptutils
 
 

Pythonwin/pywin/framework/scriptutils.py

@@ -1,19 +1,18 @@
 """
 Various utilities for running/importing a script
 """
-import bdb
-import linecache
-import os
-import string
 import sys
-import traceback
-
-import __main__
+import win32ui
 import win32api
 import win32con
-import win32ui
+import __main__
 from pywin.mfc import dialog
 from pywin.mfc.docview import TreeView
+import os
+import string
+import traceback
+import linecache
+import bdb
 
 from .cmdline import ParseArgs
 

Pythonwin/pywin/framework/sgrepmdi.py

@@ -18,17 +18,16 @@
 # Hats off to Mark Hammond for providing an environment where I could cobble
 # something like this together in a couple evenings!
 
+import win32ui
+import win32api
+from pywin.mfc import docview, dialog, window
+import win32con
+import string
+import re
 import glob
 import os
-import re
 import stat
-import string
-
-import win32api
-import win32con
-import win32ui
-from pywin.mfc import dialog, docview, window
-
+import glob
 from . import scriptutils
 
 

Pythonwin/pywin/framework/toolmenu.py

@@ -1,13 +1,11 @@
 # toolmenu.py
 
-import string
-import sys
-
-import win32api
-import win32con
 import win32ui
-
+import win32con
+import win32api
 from . import app
+import sys
+import string
 
 tools = {}
 idPos = 100
@@ -111,8 +109,8 @@ def SetToolsMenu(menu, menuPos=None):
 
 
 def HandleToolCommand(cmd, code):
-    import re
     import traceback
+    import re
 
     global tools
     (menuString, pyCmd, desc) = tools[cmd]

Pythonwin/pywin/framework/winout.py

@@ -20,15 +20,11 @@
 # This module is thread safe - output can originate from any thread.  If any thread
 # other than the main thread attempts to print, it is always queued until next idle time
 
-import queue
-import re
-import string
-
-import win32api
-import win32con
-import win32ui
-from pywin.framework import app, window
+import sys, string, re
 from pywin.mfc import docview
+from pywin.framework import app, window
+import win32ui, win32api, win32con
+import queue
 
 debug = lambda msg: None
 
@@ -47,8 +43,8 @@ class flags:
 # WindowOutputDocumentParent=docview.RichEditDoc
 # WindowOutputDocumentParent=docview.Document
 import pywin.scintilla.document
-from pywin import default_scintilla_encoding
 from pywin.scintilla import scintillacon
+from pywin import default_scintilla_encoding
 
 WindowOutputDocumentParent = pywin.scintilla.document.CScintillaDocument
 
@@ -148,8 +144,7 @@ def HandleSpecialLine(self):
             # An OLE Exception - pull apart the exception
             # and try and locate a help file.
             try:
-                import win32api
-                import win32con
+                import win32api, win32con
 
                 det = eval(line[line.find(":") + 1 :].strip())
                 win32ui.SetStatusText("Opening help file on OLE error...")

Pythonwin/pywin/idle/AutoIndent.py

@@ -1,9 +1,7 @@
-import string
-import tokenize
-
-from pywin import default_scintilla_encoding
-
+import sys
+import string, tokenize
 from . import PyParse
+from pywin import default_scintilla_encoding
 
 # tokenize() is the generator working with 'byte' objects, and
 # token_generator is the 'undocumented b/w compat' function that

Pythonwin/pywin/idle/FormatParagraph.py

@@ -14,8 +14,8 @@
 #   spaces, they will not be considered part of the same block.
 # * Fancy comments, like this bulleted list, arent handled :-)
 
-import re
 import string
+import re
 
 
 class FormatParagraph:

Pythonwin/pywin/idle/PyParse.py

@@ -1,5 +1,5 @@
-import re
 import string
+import re
 import sys
 
 # Reason last stmt is continued (or C_NONE if it's not).

Pythonwin/pywin/mfc/activex.py

@@ -1,8 +1,6 @@
 """Support for ActiveX control hosting in Pythonwin.
 """
-import win32ui
-import win32uiole
-
+import win32ui, win32uiole
 from . import window
 
 

Pythonwin/pywin/mfc/dialog.py

@@ -4,8 +4,8 @@
 # dialog.py
 # Python class for Dialog Boxes in PythonWin.
 
-import win32con
 import win32ui
+import win32con
 
 # sob - 2to3 doesn't see this as a relative import :(
 from pywin.mfc import window

Pythonwin/pywin/scintilla/control.py

@@ -4,17 +4,15 @@
 # a "standard" MFC edit control (eg, control.GetTextLength(), control.GetSel()
 # plus many Scintilla specific features (eg control.SCIAddStyledText())
 
-import array
-import os
-import string
-import struct
-
-import win32api
+from pywin.mfc import window
+from pywin import default_scintilla_encoding
 import win32con
 import win32ui
-from pywin import default_scintilla_encoding
-from pywin.mfc import window
-
+import win32api
+import array
+import struct
+import string
+import os
 from . import scintillacon
 
 # Load Scintilla.dll to get access to the control.

Pythonwin/pywin/scintilla/document.py

@@ -1,14 +1,12 @@
-import codecs
-import os
-import re
-import string
-
-import win32con
 import win32ui
-from pywin import default_scintilla_encoding
 from pywin.mfc import docview
-
+from pywin import default_scintilla_encoding
 from . import scintillacon
+import win32con
+import string
+import os
+import codecs
+import re
 
 crlf_bytes = b"\r\n"
 lf_bytes = b"\n"