diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95fe1a3d74..879c906723 100644 --- a/.github/workflows/main.yml +++ b/.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" diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000..db13ef519e --- /dev/null +++ b/.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 diff --git a/AutoDuck/BuildHHP.py b/AutoDuck/BuildHHP.py index c1134d5af0..aa1f4119f0 100644 --- a/AutoDuck/BuildHHP.py +++ b/AutoDuck/BuildHHP.py @@ -1,7 +1,7 @@ -import os -import sys import glob +import os import shutil +import sys """ BuildHHP.py diff --git a/AutoDuck/Dump2HHC.py b/AutoDuck/Dump2HHC.py index 2e80ed33b5..d6071d31b4 100644 --- a/AutoDuck/Dump2HHC.py +++ b/AutoDuck/Dump2HHC.py @@ -1,7 +1,6 @@ +import copy import os import sys -import pprint -import copy """ Dump2HHC.py diff --git a/AutoDuck/InsertExternalOverviews.py b/AutoDuck/InsertExternalOverviews.py index eb2ce103dc..c94ddef443 100644 --- a/AutoDuck/InsertExternalOverviews.py +++ b/AutoDuck/InsertExternalOverviews.py @@ -1,6 +1,5 @@ import os import sys -import string """ Replace: diff --git a/AutoDuck/TOCToHHK.py b/AutoDuck/TOCToHHK.py index a7afc82dce..235b786772 100644 --- a/AutoDuck/TOCToHHK.py +++ b/AutoDuck/TOCToHHK.py @@ -1,4 +1,3 @@ -import os import os.path import sys diff --git a/AutoDuck/document_object.py b/AutoDuck/document_object.py index 231291acd7..e610a788eb 100644 --- a/AutoDuck/document_object.py +++ b/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): diff --git a/AutoDuck/fixHelpCompression.py b/AutoDuck/fixHelpCompression.py index bef194948a..02cd78454d 100644 --- a/AutoDuck/fixHelpCompression.py +++ b/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] diff --git a/AutoDuck/makedfromi.py b/AutoDuck/makedfromi.py index bd3ebb810b..678a422e87 100644 --- a/AutoDuck/makedfromi.py +++ b/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" diff --git a/AutoDuck/py2d.py b/AutoDuck/py2d.py index 9fdb72a327..ce74e9c95c 100644 --- a/AutoDuck/py2d.py +++ b/AutoDuck/py2d.py @@ -1,6 +1,6 @@ +import re import sys import types -import re def ad_escape(s): diff --git a/Pythonwin/Scintilla/src/LexGen.py b/Pythonwin/Scintilla/src/LexGen.py index bb04db2388..c030921ce9 100644 --- a/Pythonwin/Scintilla/src/LexGen.py +++ b/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" diff --git a/Pythonwin/pywin/Demos/app/basictimerapp.py b/Pythonwin/pywin/Demos/app/basictimerapp.py index bd5d2fe083..da771da115 100644 --- a/Pythonwin/pywin/Demos/app/basictimerapp.py +++ b/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): diff --git a/Pythonwin/pywin/Demos/app/customprint.py b/Pythonwin/pywin/Demos/app/customprint.py index 77c5fa0633..356073e5fb 100644 --- a/Pythonwin/pywin/Demos/app/customprint.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/app/demoutils.py b/Pythonwin/pywin/Demos/app/demoutils.py index af99f44b87..ee1fefcfad 100644 --- a/Pythonwin/pywin/Demos/app/demoutils.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/app/dlgappdemo.py b/Pythonwin/pywin/Demos/app/dlgappdemo.py index 40c2246079..38659a62fc 100644 --- a/Pythonwin/pywin/Demos/app/dlgappdemo.py +++ b/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): diff --git a/Pythonwin/pywin/Demos/app/dojobapp.py b/Pythonwin/pywin/Demos/app/dojobapp.py index 712f0e3505..d97ce5e2a8 100644 --- a/Pythonwin/pywin/Demos/app/dojobapp.py +++ b/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): diff --git a/Pythonwin/pywin/Demos/app/helloapp.py b/Pythonwin/pywin/Demos/app/helloapp.py index 29db067feb..876f16f71d 100644 --- a/Pythonwin/pywin/Demos/app/helloapp.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/cmdserver.py b/Pythonwin/pywin/Demos/cmdserver.py index d244fc186a..7b1c257a38 100644 --- a/Pythonwin/pywin/Demos/cmdserver.py +++ b/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!" diff --git a/Pythonwin/pywin/Demos/createwin.py b/Pythonwin/pywin/Demos/createwin.py index d817d0f671..38f6947edd 100644 --- a/Pythonwin/pywin/Demos/createwin.py +++ b/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): diff --git a/Pythonwin/pywin/Demos/demoutils.py b/Pythonwin/pywin/Demos/demoutils.py index 427a3f12e9..f6080c465b 100644 --- a/Pythonwin/pywin/Demos/demoutils.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/dibdemo.py b/Pythonwin/pywin/Demos/dibdemo.py index c3256a127f..615227abf2 100644 --- a/Pythonwin/pywin/Demos/dibdemo.py +++ b/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: diff --git a/Pythonwin/pywin/Demos/dlgtest.py b/Pythonwin/pywin/Demos/dlgtest.py index 6e291dae54..8dcb0e5efa 100644 --- a/Pythonwin/pywin/Demos/dlgtest.py +++ b/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): diff --git a/Pythonwin/pywin/Demos/dyndlg.py b/Pythonwin/pywin/Demos/dyndlg.py index 1124d1c4c7..46a4e7fc67 100644 --- a/Pythonwin/pywin/Demos/dyndlg.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/fontdemo.py b/Pythonwin/pywin/Demos/fontdemo.py index 37220c6c35..fc35f4ca38 100644 --- a/Pythonwin/pywin/Demos/fontdemo.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/guidemo.py b/Pythonwin/pywin/Demos/guidemo.py index 820dbf4126..b4d88159a0 100644 --- a/Pythonwin/pywin/Demos/guidemo.py +++ b/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()"), diff --git a/Pythonwin/pywin/Demos/hiertest.py b/Pythonwin/pywin/Demos/hiertest.py index 64b7a727ce..287b71dafa 100644 --- a/Pythonwin/pywin/Demos/hiertest.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/menutest.py b/Pythonwin/pywin/Demos/menutest.py index bd293bf7b1..d2ba65b6dd 100644 --- a/Pythonwin/pywin/Demos/menutest.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/ocx/demoutils.py b/Pythonwin/pywin/Demos/ocx/demoutils.py index f95253fedc..27fa091cbc 100644 --- a/Pythonwin/pywin/Demos/ocx/demoutils.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/ocx/flash.py b/Pythonwin/pywin/Demos/ocx/flash.py index 663fef0e15..239240ee33 100644 --- a/Pythonwin/pywin/Demos/ocx/flash.py +++ b/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: diff --git a/Pythonwin/pywin/Demos/ocx/msoffice.py b/Pythonwin/pywin/Demos/ocx/msoffice.py index 4f9804b448..be24ead82f 100644 --- a/Pythonwin/pywin/Demos/ocx/msoffice.py +++ b/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: diff --git a/Pythonwin/pywin/Demos/ocx/ocxserialtest.py b/Pythonwin/pywin/Demos/ocx/ocxserialtest.py index 677cb14cad..326d312c8f 100644 --- a/Pythonwin/pywin/Demos/ocx/ocxserialtest.py +++ b/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 diff --git a/Pythonwin/pywin/Demos/ocx/ocxtest.py b/Pythonwin/pywin/Demos/ocx/ocxtest.py index 34f5f0095e..4a3d73363d 100644 --- a/Pythonwin/pywin/Demos/ocx/ocxtest.py +++ b/Pythonwin/pywin/Demos/ocx/ocxtest.py @@ -5,10 +5,14 @@ # # The .py files behind the OCXs will be automatically generated and imported. -from pywin.mfc import dialog, window, activex -import win32ui, win32uiole +import glob +import os + +import win32api import win32con -import os, sys, win32api, glob +import win32ui +import win32uiole +from pywin.mfc import activex, dialog, window from win32com.client import gencache diff --git a/Pythonwin/pywin/Demos/ocx/webbrowser.py b/Pythonwin/pywin/Demos/ocx/webbrowser.py index fc052c44d7..cc17445e9a 100644 --- a/Pythonwin/pywin/Demos/ocx/webbrowser.py +++ b/Pythonwin/pywin/Demos/ocx/webbrowser.py @@ -3,11 +3,15 @@ # It catches an "OnNavigate" event, and updates the frame title. # (event stuff by Neil Hodgson) -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 + WebBrowserModule = gencache.EnsureModule( "{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}", 0, 1, 1 ) diff --git a/Pythonwin/pywin/Demos/openGLDemo.py b/Pythonwin/pywin/Demos/openGLDemo.py index 18b65fa292..9274949dea 100644 --- a/Pythonwin/pywin/Demos/openGLDemo.py +++ b/Pythonwin/pywin/Demos/openGLDemo.py @@ -1,20 +1,21 @@ # Ported from the win32 and MFC OpenGL Samples. -from pywin.mfc import docview import sys +from pywin.mfc import docview + try: - from OpenGL.GL import * - from OpenGL.GLU import * + from OpenGL.GL import * # nopycln: import + from OpenGL.GLU import * # nopycln: import except ImportError: print("The OpenGL extensions do not appear to be installed.") print("This Pythonwin demo can not run") sys.exit(1) +import timer +import win32api import win32con import win32ui -import win32api -import timer PFD_TYPE_RGBA = 0 PFD_TYPE_COLORINDEX = 1 diff --git a/Pythonwin/pywin/Demos/progressbar.py b/Pythonwin/pywin/Demos/progressbar.py index a0c4129a5e..81cd7e381d 100644 --- a/Pythonwin/pywin/Demos/progressbar.py +++ b/Pythonwin/pywin/Demos/progressbar.py @@ -17,9 +17,9 @@ # Example and progress bar code courtesy of KDL Technologies, Ltd., Hong Kong SAR, China. # -from pywin.mfc import dialog -import win32ui import win32con +import win32ui +from pywin.mfc import dialog def MakeDlgTemplate(): diff --git a/Pythonwin/pywin/Demos/sliderdemo.py b/Pythonwin/pywin/Demos/sliderdemo.py index d41a89da7b..9fc7b57057 100644 --- a/Pythonwin/pywin/Demos/sliderdemo.py +++ b/Pythonwin/pywin/Demos/sliderdemo.py @@ -1,7 +1,8 @@ # sliderdemo.py # Demo of the slider control courtesy of Mike Fletcher. -import win32con, win32ui +import win32con +import win32ui from pywin.mfc import dialog diff --git a/Pythonwin/pywin/Demos/splittst.py b/Pythonwin/pywin/Demos/splittst.py index 7fe90eee8d..0114bf09a3 100644 --- a/Pythonwin/pywin/Demos/splittst.py +++ b/Pythonwin/pywin/Demos/splittst.py @@ -1,8 +1,7 @@ -import win32ui -import win32con -import fontdemo -from pywin.mfc import window, docview import commctrl +import fontdemo +import win32ui +from pywin.mfc import docview, window # derive from CMDIChild. This does much work for us. diff --git a/Pythonwin/pywin/Demos/threadedgui.py b/Pythonwin/pywin/Demos/threadedgui.py index f9e5a0c8e3..bbe1369e48 100644 --- a/Pythonwin/pywin/Demos/threadedgui.py +++ b/Pythonwin/pywin/Demos/threadedgui.py @@ -2,15 +2,13 @@ # Also demo of a GUI thread, pretty much direct from the MFC C++ sample MTMDI. -import win32ui -import win32con -import win32api import timer - -from pywin.mfc import window, docview, thread +import win32api +import win32con +import win32ui +from pywin.mfc import docview, thread, window from pywin.mfc.thread import WinThread - WM_USER_PREPARE_TO_CLOSE = win32con.WM_USER + 32 # font is a dictionary in which the following elements matter: diff --git a/Pythonwin/pywin/Demos/toolbar.py b/Pythonwin/pywin/Demos/toolbar.py index 77bb044579..e56aefef18 100644 --- a/Pythonwin/pywin/Demos/toolbar.py +++ b/Pythonwin/pywin/Demos/toolbar.py @@ -3,11 +3,11 @@ # Shows the toolbar control. # Demos how to make custom tooltips, etc. -import win32ui -import win32con -import win32api -from pywin.mfc import docview, window, afxres import commctrl +import win32api +import win32con +import win32ui +from pywin.mfc import afxres, docview, window class GenericFrame(window.MDIChildWnd): diff --git a/Pythonwin/pywin/debugger/__init__.py b/Pythonwin/pywin/debugger/__init__.py index 8094ec191e..5f41960d36 100644 --- a/Pythonwin/pywin/debugger/__init__.py +++ b/Pythonwin/pywin/debugger/__init__.py @@ -22,6 +22,7 @@ def _CheckNeedGUI(): need = 0 if need: import pywin.framework.app + from . import dbgpyapp pywin.framework.app.CreateDefaultGUI(dbgpyapp.DebuggerPythonApp) diff --git a/Pythonwin/pywin/debugger/configui.py b/Pythonwin/pywin/debugger/configui.py index 691c289dbd..32de4ee5ff 100644 --- a/Pythonwin/pywin/debugger/configui.py +++ b/Pythonwin/pywin/debugger/configui.py @@ -1,6 +1,7 @@ -from . import dbgcon -from pywin.mfc import dialog import win32ui +from pywin.mfc import dialog + +from . import dbgcon class DebuggerOptionsPropPage(dialog.PropertyPage): diff --git a/Pythonwin/pywin/debugger/dbgcon.py b/Pythonwin/pywin/debugger/dbgcon.py index 1ae470bb4e..402ec64b35 100644 --- a/Pythonwin/pywin/debugger/dbgcon.py +++ b/Pythonwin/pywin/debugger/dbgcon.py @@ -12,7 +12,8 @@ OPT_HIDE = "hide" OPT_STOP_EXCEPTIONS = "stopatexceptions" -import win32api, win32ui +import win32api +import win32ui def DoGetOption(optsDict, optName, default): diff --git a/Pythonwin/pywin/debugger/dbgpyapp.py b/Pythonwin/pywin/debugger/dbgpyapp.py index 33f566653e..207f404938 100644 --- a/Pythonwin/pywin/debugger/dbgpyapp.py +++ b/Pythonwin/pywin/debugger/dbgpyapp.py @@ -1,10 +1,9 @@ # dbgpyapp.py - Debugger Python application class # +import sys + import win32con import win32ui -import sys -import string -import os from pywin.framework import intpyapp version = "0.3.0" diff --git a/Pythonwin/pywin/debugger/debugger.py b/Pythonwin/pywin/debugger/debugger.py index 4e9807ef50..4acf9bc4d2 100644 --- a/Pythonwin/pywin/debugger/debugger.py +++ b/Pythonwin/pywin/debugger/debugger.py @@ -8,23 +8,23 @@ # >>> import pywin.debugger # >>> pywin.debugger.GetDebugger().run("command") -import pdb import bdb -import sys -import string import os +import pdb +import string +import sys +import traceback import types -import win32ui +import commctrl +import pywin.docking.DockingBar import win32api import win32con -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 +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 from pywin.tools import browser, hierlist -import commctrl -import traceback # import win32traceutil if win32ui.UNICODE: diff --git a/Pythonwin/pywin/debugger/fail.py b/Pythonwin/pywin/debugger/fail.py index 3e6aaa8157..97721576c8 100644 --- a/Pythonwin/pywin/debugger/fail.py +++ b/Pythonwin/pywin/debugger/fail.py @@ -5,8 +5,10 @@ # It does nothing useful, and it even doesnt do that! -import pywin.debugger, sys, time -import traceback +import sys +import time + +import pywin.debugger def a(): @@ -20,7 +22,6 @@ def a(): a = 2 a = 3 a = 4 - pass def b(): @@ -31,7 +32,6 @@ def b(): # broke into the debugger using the "set_trace() function # "pywin.debugger.brk()" is a shorter alias for this. c() - pass def c(): diff --git a/Pythonwin/pywin/dialogs/ideoptions.py b/Pythonwin/pywin/dialogs/ideoptions.py index cbe5a4a593..f1bae90df7 100644 --- a/Pythonwin/pywin/dialogs/ideoptions.py +++ b/Pythonwin/pywin/dialogs/ideoptions.py @@ -1,9 +1,9 @@ # The property page to define generic IDE options for Pythonwin -from pywin.mfc import dialog -from pywin.framework import interact -import win32ui import win32con +import win32ui +from pywin.framework import interact +from pywin.mfc import dialog buttonControlMap = { win32ui.IDC_BUTTON1: win32ui.IDC_EDIT1, diff --git a/Pythonwin/pywin/dialogs/list.py b/Pythonwin/pywin/dialogs/list.py index efe11a1612..b9934ce71d 100644 --- a/Pythonwin/pywin/dialogs/list.py +++ b/Pythonwin/pywin/dialogs/list.py @@ -1,5 +1,8 @@ +import commctrl +import win32api +import win32con +import win32ui from pywin.mfc import dialog -import win32ui, win32con, commctrl, win32api class ListDialog(dialog.Dialog): diff --git a/Pythonwin/pywin/dialogs/login.py b/Pythonwin/pywin/dialogs/login.py index 7e559d6363..2a3295693e 100644 --- a/Pythonwin/pywin/dialogs/login.py +++ b/Pythonwin/pywin/dialogs/login.py @@ -23,9 +23,9 @@ Merged with dlgpass and moved to pywin.dialogs by Mark Hammond Jan 1998. """ -import win32ui import win32api import win32con +import win32ui from pywin.mfc import dialog diff --git a/Pythonwin/pywin/dialogs/status.py b/Pythonwin/pywin/dialogs/status.py index fddd28ab3b..aef3391488 100644 --- a/Pythonwin/pywin/dialogs/status.py +++ b/Pythonwin/pywin/dialogs/status.py @@ -1,13 +1,14 @@ # No cancel button. -from pywin.mfc import dialog -from pywin.mfc.thread import WinThread import threading -import win32ui -import win32con -import win32api import time +import win32api +import win32con +import win32ui +from pywin.mfc import dialog +from pywin.mfc.thread import WinThread + def MakeProgressDlgTemplate(caption, staticText=""): style = ( diff --git a/Pythonwin/pywin/docking/DockingBar.py b/Pythonwin/pywin/docking/DockingBar.py index 279eaccbd4..3e51eb7031 100644 --- a/Pythonwin/pywin/docking/DockingBar.py +++ b/Pythonwin/pywin/docking/DockingBar.py @@ -6,10 +6,13 @@ # Currently we support only one child per DockingBar. Later we need to add # support for multiple children. -import win32api, win32con, win32ui -from pywin.mfc import afxres, window import struct +import win32api +import win32con +import win32ui +from pywin.mfc import afxres, window + clrBtnHilight = win32api.GetSysColor(win32con.COLOR_BTNHILIGHT) clrBtnShadow = win32api.GetSysColor(win32con.COLOR_BTNSHADOW) diff --git a/Pythonwin/pywin/framework/app.py b/Pythonwin/pywin/framework/app.py index dc958d6d17..f994f99f91 100644 --- a/Pythonwin/pywin/framework/app.py +++ b/Pythonwin/pywin/framework/app.py @@ -4,16 +4,16 @@ # # We also grab the FileOpen command, to invoke our Python editor " The PythonWin application code. Manages most aspects of MDI, etc " -import win32con -import win32api -import win32ui -import sys -import string import os -from pywin.mfc import window, dialog, afxres -from pywin.mfc.thread import WinApp +import sys import traceback + import regutil +import win32api +import win32con +import win32ui +from pywin.mfc import afxres, dialog, window +from pywin.mfc.thread import WinApp from . import scriptutils diff --git a/Pythonwin/pywin/framework/bitmap.py b/Pythonwin/pywin/framework/bitmap.py index 9b5d643447..1501f72d89 100644 --- a/Pythonwin/pywin/framework/bitmap.py +++ b/Pythonwin/pywin/framework/bitmap.py @@ -1,13 +1,12 @@ -import win32ui -import win32con -import win32api -import string import os -from . import app -import sys +import win32api +import win32con +import win32ui from pywin.mfc import docview, window +from . import app + bStretch = 1 diff --git a/Pythonwin/pywin/framework/cmdline.py b/Pythonwin/pywin/framework/cmdline.py index 8092b5817d..dba31d1ad1 100644 --- a/Pythonwin/pywin/framework/cmdline.py +++ b/Pythonwin/pywin/framework/cmdline.py @@ -1,7 +1,8 @@ # cmdline - command line utilities. +import string import sys + import win32ui -import string def ParseArgs(str): diff --git a/Pythonwin/pywin/framework/dbgcommands.py b/Pythonwin/pywin/framework/dbgcommands.py index feee032e0c..e295926c79 100644 --- a/Pythonwin/pywin/framework/dbgcommands.py +++ b/Pythonwin/pywin/framework/dbgcommands.py @@ -3,11 +3,13 @@ # Not in the debugger package, as I always want these interfaces to be # available, even if the debugger has not yet been (or can not be) # imported -import win32ui, win32con -from . import scriptutils import warnings + +import win32ui from pywin.scintilla.control import CScintillaEditInterface +from . import scriptutils + IdToBarNames = { win32ui.IDC_DBG_STACK: ("Stack", 0), win32ui.IDC_DBG_BREAKPOINTS: ("Breakpoints", 0), diff --git a/Pythonwin/pywin/framework/dlgappcore.py b/Pythonwin/pywin/framework/dlgappcore.py index b1bb1ab43e..4b60cc1c0a 100644 --- a/Pythonwin/pywin/framework/dlgappcore.py +++ b/Pythonwin/pywin/framework/dlgappcore.py @@ -2,13 +2,14 @@ # # base classes for dialog based apps. -from . import app -import win32ui -import win32con + import win32api -import sys +import win32con +import win32ui from pywin.mfc import dialog +from . import app + error = "Dialog Application Error" diff --git a/Pythonwin/pywin/framework/editor/ModuleBrowser.py b/Pythonwin/pywin/framework/editor/ModuleBrowser.py index f5f10ad62e..7fd965327d 100644 --- a/Pythonwin/pywin/framework/editor/ModuleBrowser.py +++ b/Pythonwin/pywin/framework/editor/ModuleBrowser.py @@ -1,14 +1,14 @@ # ModuleBrowser.py - A view that provides a module browser for an editor document. -import pywin.mfc.docview -import win32ui -import win32con +import pyclbr + +import afxres import commctrl -import win32api -from pywin.tools import hierlist, browser import pywin.framework.scriptutils -import afxres - -import pyclbr +import pywin.mfc.docview +import win32api +import win32con +import win32ui +from pywin.tools import browser, hierlist class HierListCLBRModule(hierlist.HierListItem): diff --git a/Pythonwin/pywin/framework/editor/__init__.py b/Pythonwin/pywin/framework/editor/__init__.py index e8f3233257..ce13ece65c 100644 --- a/Pythonwin/pywin/framework/editor/__init__.py +++ b/Pythonwin/pywin/framework/editor/__init__.py @@ -5,7 +5,10 @@ # This really isnt necessary with Scintilla, and scintilla # is getting so deeply embedded that it was too much work. -import win32ui, sys, win32con +import sys + +import win32con +import win32ui defaultCharacterFormat = (-402653169, 0, 200, 0, 0, 0, 49, "Courier New") diff --git a/Pythonwin/pywin/framework/editor/color/coloreditor.py b/Pythonwin/pywin/framework/editor/color/coloreditor.py index ecc31f37f3..4aacc0eab5 100644 --- a/Pythonwin/pywin/framework/editor/color/coloreditor.py +++ b/Pythonwin/pywin/framework/editor/color/coloreditor.py @@ -1,20 +1,18 @@ # Color Editor originally by Neil Hodgson, but restructured by mh to integrate # even tighter into Pythonwin. -import win32ui -import win32con -import win32api -import sys import pywin.scintilla.keycodes -from pywin.scintilla import bindings - +import win32api +import win32con +import win32ui from pywin.framework.editor import ( - GetEditorOption, - SetEditorOption, GetEditorFontOption, + GetEditorOption, SetEditorFontOption, + SetEditorOption, defaultCharacterFormat, ) +from pywin.scintilla import bindings # from pywin.framework.editor import EditorPropertyPage @@ -27,11 +25,11 @@ MARKER_BREAKPOINT = 1 MARKER_CURRENT = 2 +import pywin.scintilla.view from pywin.debugger import dbgcon -from pywin.scintilla.document import CScintillaDocument from pywin.framework.editor.document import EditorDocumentBase from pywin.scintilla import scintillacon # For the marker definitions -import pywin.scintilla.view +from pywin.scintilla.document import CScintillaDocument class SyntEditDocument(EditorDocumentBase): diff --git a/Pythonwin/pywin/framework/editor/configui.py b/Pythonwin/pywin/framework/editor/configui.py index a4dbe85922..903ad66c74 100644 --- a/Pythonwin/pywin/framework/editor/configui.py +++ b/Pythonwin/pywin/framework/editor/configui.py @@ -1,19 +1,19 @@ -from pywin.mfc import dialog -from . import document -import win32ui -import win32con +import pywin.scintilla.config import win32api - +import win32con +import win32ui from pywin.framework.editor import ( - GetEditorOption, - SetEditorOption, DeleteEditorOption, GetEditorFontOption, + GetEditorOption, SetEditorFontOption, + SetEditorOption, defaultCharacterFormat, editorTemplate, ) -import pywin.scintilla.config +from pywin.mfc import dialog + +from . import document # The standard 16 color VGA palette should always be possible paletteVGA = ( diff --git a/Pythonwin/pywin/framework/editor/document.py b/Pythonwin/pywin/framework/editor/document.py index 8204754a76..e66947b81c 100644 --- a/Pythonwin/pywin/framework/editor/document.py +++ b/Pythonwin/pywin/framework/editor/document.py @@ -1,14 +1,14 @@ # We no longer support the old, non-colour editor! -from pywin.mfc import docview, object -from pywin.framework.editor import GetEditorOption -import win32ui import os -import win32con -import string +import shutil import traceback + import win32api -import shutil +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/editor/editor.py b/Pythonwin/pywin/framework/editor/editor.py index 7cb223b616..aa1f53857d 100644 --- a/Pythonwin/pywin/framework/editor/editor.py +++ b/Pythonwin/pywin/framework/editor/editor.py @@ -17,23 +17,20 @@ # Note that it will _always_ prompt you if the file in the editor has been modified. -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 ( - GetEditorOption, - SetEditorOption, GetEditorFontOption, + GetEditorOption, SetEditorFontOption, + SetEditorOption, defaultCharacterFormat, ) +from pywin.mfc import afxres, dialog, docview patImport = regex.symcomp("import \(.*\)") patIndent = regex.compile("^\\([ \t]*[~ \t]\\)") diff --git a/Pythonwin/pywin/framework/editor/frame.py b/Pythonwin/pywin/framework/editor/frame.py index 9bce8b11e8..e927d16e5f 100644 --- a/Pythonwin/pywin/framework/editor/frame.py +++ b/Pythonwin/pywin/framework/editor/frame.py @@ -1,8 +1,7 @@ # frame.py - The MDI frame window for an editor. import pywin.framework.window -import win32ui import win32con -import afxres +import win32ui from . import ModuleBrowser diff --git a/Pythonwin/pywin/framework/editor/template.py b/Pythonwin/pywin/framework/editor/template.py index 62565b320f..362a74a62d 100644 --- a/Pythonwin/pywin/framework/editor/template.py +++ b/Pythonwin/pywin/framework/editor/template.py @@ -1,9 +1,10 @@ -import string -import win32ui +import os + +import pywin.framework.window import win32api +import win32ui from pywin.mfc import docview -import pywin.framework.window -import os + from . import frame ParentEditorTemplate = docview.DocTemplate diff --git a/Pythonwin/pywin/framework/editor/vss.py b/Pythonwin/pywin/framework/editor/vss.py index 7d23d4b855..718f83eea4 100644 --- a/Pythonwin/pywin/framework/editor/vss.py +++ b/Pythonwin/pywin/framework/editor/vss.py @@ -16,10 +16,13 @@ # Database=?? -import win32ui, win32api, win32con, os, string, sys - +import os +import sys import traceback +import win32api +import win32ui + g_iniName = "Mssccprj.scc" # Use the same INI name as VB! g_sourceSafe = None @@ -65,7 +68,8 @@ def CheckoutFile(fileName): # and that the INI file can be found in that path # (or a parent path if a ni style package) try: - import win32com.client, win32com.client.gencache + import win32com.client + import win32com.client.gencache mod = win32com.client.gencache.EnsureModule( "{783CD4E0-9D54-11CF-B8EE-00608CC9A71F}", 0, 5, 0 diff --git a/Pythonwin/pywin/framework/help.py b/Pythonwin/pywin/framework/help.py index d54d25c28a..ab664b4d1a 100644 --- a/Pythonwin/pywin/framework/help.py +++ b/Pythonwin/pywin/framework/help.py @@ -1,11 +1,10 @@ # help.py - help utilities for PythonWin. +import os + +import regutil import win32api import win32con import win32ui -import string -import sys -import regutil -import string, os htmlhelp_handle = None diff --git a/Pythonwin/pywin/framework/interact.py b/Pythonwin/pywin/framework/interact.py index e7d7a05ba6..5f0b87f2e1 100644 --- a/Pythonwin/pywin/framework/interact.py +++ b/Pythonwin/pywin/framework/interact.py @@ -3,23 +3,23 @@ ## Interactive Shell Window ## -import sys, os +import array import code +import os import string - -import win32ui -import win32api -import win32clipboard -import win32con +import sys import traceback -import afxres -import array -import __main__ -import pywin.scintilla.formatter +import __main__ +import afxres +import pywin.framework.app import pywin.scintilla.control +import pywin.scintilla.formatter import pywin.scintilla.IDLEenvironment -import pywin.framework.app +import win32api +import win32clipboard +import win32con +import win32ui ## sequential after ID_GOTO_LINE defined in editor.py ID_EDIT_COPY_CODE = 0xE2002 @@ -27,10 +27,10 @@ trace = pywin.scintilla.formatter.trace -from . import winout - import re +from . import winout + # from IDLE. _is_block_opener = re.compile(r":\s*(#.*)?$").search _is_block_closer = re.compile( diff --git a/Pythonwin/pywin/framework/intpyapp.py b/Pythonwin/pywin/framework/intpyapp.py index 54dfb5acce..48461dbab0 100644 --- a/Pythonwin/pywin/framework/intpyapp.py +++ b/Pythonwin/pywin/framework/intpyapp.py @@ -1,16 +1,17 @@ # intpyapp.py - Interactive Python application class # -import win32con -import win32api -import win32ui -import __main__ -import sys import os -from . import app +import sys import traceback -from pywin.mfc import afxres, dialog + +import __main__ import commctrl -from . import dbgcommands +import win32api +import win32con +import win32ui +from pywin.mfc import afxres, dialog + +from . import app, dbgcommands lastLocateFileName = ".py" # used in the "File/Locate" dialog... diff --git a/Pythonwin/pywin/framework/intpydde.py b/Pythonwin/pywin/framework/intpydde.py index a6d6a3788c..1f869b0f68 100644 --- a/Pythonwin/pywin/framework/intpydde.py +++ b/Pythonwin/pywin/framework/intpydde.py @@ -5,11 +5,13 @@ # is open. Strange, but true. If you have problems with this, close all Command Prompts! +import sys +import traceback + +import win32api import win32ui -import win32api, win32con -from pywin.mfc import object from dde import * -import sys, traceback +from pywin.mfc import object class DDESystemTopic(object.Object): diff --git a/Pythonwin/pywin/framework/mdi_pychecker.py b/Pythonwin/pywin/framework/mdi_pychecker.py index 9e6821027b..c89f33b9b9 100644 --- a/Pythonwin/pywin/framework/mdi_pychecker.py +++ b/Pythonwin/pywin/framework/mdi_pychecker.py @@ -33,11 +33,17 @@ ## ###################################################################### -import win32ui +import glob +import os +import re +import sys +import time + import win32api -from pywin.mfc import docview, dialog, window import win32con -import sys, string, re, glob, os, stat, time +import win32ui +from pywin.mfc import dialog, docview, window + from . import scriptutils diff --git a/Pythonwin/pywin/framework/scriptutils.py b/Pythonwin/pywin/framework/scriptutils.py index 36bb30536f..e5bc57c8ff 100644 --- a/Pythonwin/pywin/framework/scriptutils.py +++ b/Pythonwin/pywin/framework/scriptutils.py @@ -1,18 +1,18 @@ """ Various utilities for running/importing a script """ +import bdb +import linecache +import os import sys -import win32ui +import traceback + +import __main__ import win32api import win32con -import __main__ +import win32ui 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 diff --git a/Pythonwin/pywin/framework/sgrepmdi.py b/Pythonwin/pywin/framework/sgrepmdi.py index 7983912a5e..b7d938bbb3 100644 --- a/Pythonwin/pywin/framework/sgrepmdi.py +++ b/Pythonwin/pywin/framework/sgrepmdi.py @@ -18,16 +18,15 @@ # 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 stat -import glob +import re + +import win32api +import win32con +import win32ui +from pywin.mfc import dialog, docview, window + from . import scriptutils diff --git a/Pythonwin/pywin/framework/startup.py b/Pythonwin/pywin/framework/startup.py index 049cfad59a..4a7323225d 100644 --- a/Pythonwin/pywin/framework/startup.py +++ b/Pythonwin/pywin/framework/startup.py @@ -8,8 +8,9 @@ # Keep this as short as possible, cos error output is only redirected if # this runs OK. Errors in imported modules are much better - the messages go somewhere (not any more :-) -import sys import os +import sys + import win32api import win32ui @@ -39,7 +40,8 @@ # we update the pywin path to ensure it is absolute. # If it is indeed relative, it will be relative to our current directory. # If its already absolute, then this will have no affect. -import pywin, pywin.framework +import pywin +import pywin.framework pywin.__path__[0] = win32ui.FullPath(pywin.__path__[0]) pywin.framework.__path__[0] = win32ui.FullPath(pywin.framework.__path__[0]) diff --git a/Pythonwin/pywin/framework/toolmenu.py b/Pythonwin/pywin/framework/toolmenu.py index bd4c7138f0..3f739e09e8 100644 --- a/Pythonwin/pywin/framework/toolmenu.py +++ b/Pythonwin/pywin/framework/toolmenu.py @@ -1,11 +1,12 @@ # toolmenu.py -import win32ui -import win32con +import sys + import win32api +import win32con +import win32ui + from . import app -import sys -import string tools = {} idPos = 100 @@ -109,8 +110,8 @@ def SetToolsMenu(menu, menuPos=None): def HandleToolCommand(cmd, code): - import traceback import re + import traceback global tools (menuString, pyCmd, desc) = tools[cmd] diff --git a/Pythonwin/pywin/framework/winout.py b/Pythonwin/pywin/framework/winout.py index 49f0246f56..e78e959a9a 100644 --- a/Pythonwin/pywin/framework/winout.py +++ b/Pythonwin/pywin/framework/winout.py @@ -20,11 +20,14 @@ # 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 sys, string, re -from pywin.mfc import docview -from pywin.framework import app, window -import win32ui, win32api, win32con import queue +import re + +import win32api +import win32con +import win32ui +from pywin.framework import app, window +from pywin.mfc import docview debug = lambda msg: None @@ -43,8 +46,8 @@ class flags: # WindowOutputDocumentParent=docview.RichEditDoc # WindowOutputDocumentParent=docview.Document import pywin.scintilla.document -from pywin.scintilla import scintillacon from pywin import default_scintilla_encoding +from pywin.scintilla import scintillacon WindowOutputDocumentParent = pywin.scintilla.document.CScintillaDocument @@ -144,7 +147,8 @@ def HandleSpecialLine(self): # An OLE Exception - pull apart the exception # and try and locate a help file. try: - import win32api, win32con + import win32api + import win32con det = eval(line[line.find(":") + 1 :].strip()) win32ui.SetStatusText("Opening help file on OLE error...") diff --git a/Pythonwin/pywin/idle/AutoExpand.py b/Pythonwin/pywin/idle/AutoExpand.py index 2305b557fc..3b302ee93d 100644 --- a/Pythonwin/pywin/idle/AutoExpand.py +++ b/Pythonwin/pywin/idle/AutoExpand.py @@ -1,5 +1,5 @@ -import string import re +import string ###$ event <> ###$ win diff --git a/Pythonwin/pywin/idle/AutoIndent.py b/Pythonwin/pywin/idle/AutoIndent.py index 60cb8833c1..c5adc5f866 100644 --- a/Pythonwin/pywin/idle/AutoIndent.py +++ b/Pythonwin/pywin/idle/AutoIndent.py @@ -1,8 +1,10 @@ import sys -import string, tokenize -from . import PyParse +import tokenize + from pywin import default_scintilla_encoding +from . import PyParse + if sys.version_info < (3,): # in py2k, tokenize() takes a 'token eater' callback, while # generate_tokens is a generator that works with str objects. diff --git a/Pythonwin/pywin/idle/CallTips.py b/Pythonwin/pywin/idle/CallTips.py index ae9e2b6c2d..cecc760a14 100644 --- a/Pythonwin/pywin/idle/CallTips.py +++ b/Pythonwin/pywin/idle/CallTips.py @@ -1,9 +1,9 @@ # CallTips.py - An IDLE extension that provides "Call Tips" - ie, a floating window that # displays parameter information as you open parens. +import inspect import string import sys -import inspect import traceback diff --git a/Pythonwin/pywin/idle/FormatParagraph.py b/Pythonwin/pywin/idle/FormatParagraph.py index 3376632129..143c18ee32 100644 --- a/Pythonwin/pywin/idle/FormatParagraph.py +++ b/Pythonwin/pywin/idle/FormatParagraph.py @@ -14,7 +14,6 @@ # spaces, they will not be considered part of the same block. # * Fancy comments, like this bulleted list, arent handled :-) -import string import re diff --git a/Pythonwin/pywin/idle/IdleHistory.py b/Pythonwin/pywin/idle/IdleHistory.py index 693adf50aa..24e6924008 100644 --- a/Pythonwin/pywin/idle/IdleHistory.py +++ b/Pythonwin/pywin/idle/IdleHistory.py @@ -1,6 +1,3 @@ -import string - - class History: def __init__(self, text, output_sep="\n"): self.text = text diff --git a/Pythonwin/pywin/idle/PyParse.py b/Pythonwin/pywin/idle/PyParse.py index b4da7150cf..173336cade 100644 --- a/Pythonwin/pywin/idle/PyParse.py +++ b/Pythonwin/pywin/idle/PyParse.py @@ -1,5 +1,5 @@ -import string import re +import string import sys # Reason last stmt is continued (or C_NONE if it's not). diff --git a/Pythonwin/pywin/mfc/activex.py b/Pythonwin/pywin/mfc/activex.py index 19a11330e7..596bbef5e8 100644 --- a/Pythonwin/pywin/mfc/activex.py +++ b/Pythonwin/pywin/mfc/activex.py @@ -1,6 +1,8 @@ """Support for ActiveX control hosting in Pythonwin. """ -import win32ui, win32uiole +import win32ui +import win32uiole + from . import window # XXX - we are still "classic style" classes in py2x, so we need can't yet diff --git a/Pythonwin/pywin/mfc/dialog.py b/Pythonwin/pywin/mfc/dialog.py index 2a9dc73478..25fe13635b 100644 --- a/Pythonwin/pywin/mfc/dialog.py +++ b/Pythonwin/pywin/mfc/dialog.py @@ -4,8 +4,8 @@ # dialog.py # Python class for Dialog Boxes in PythonWin. -import win32ui import win32con +import win32ui # sob - 2to3 doesn't see this as a relative import :( from pywin.mfc import window diff --git a/Pythonwin/pywin/mfc/docview.py b/Pythonwin/pywin/mfc/docview.py index 584b450a9f..7da91b460d 100644 --- a/Pythonwin/pywin/mfc/docview.py +++ b/Pythonwin/pywin/mfc/docview.py @@ -1,8 +1,7 @@ # document and view classes for MFC. import win32ui -import win32con -from . import object -from . import window + +from . import object, window class View(window.Wnd): diff --git a/Pythonwin/pywin/mfc/object.py b/Pythonwin/pywin/mfc/object.py index 567f087461..70138b6ee2 100644 --- a/Pythonwin/pywin/mfc/object.py +++ b/Pythonwin/pywin/mfc/object.py @@ -1,5 +1,5 @@ # MFC base classes. -import sys + import win32ui diff --git a/Pythonwin/pywin/mfc/thread.py b/Pythonwin/pywin/mfc/thread.py index 9d82cd1f76..90a0a762cb 100644 --- a/Pythonwin/pywin/mfc/thread.py +++ b/Pythonwin/pywin/mfc/thread.py @@ -1,8 +1,9 @@ # Thread and application objects -from . import object import win32ui +from . import object + class WinThread(object.CmdTarget): def __init__(self, initObj=None): diff --git a/Pythonwin/pywin/mfc/window.py b/Pythonwin/pywin/mfc/window.py index 6e163a323c..e52a7c1cfb 100644 --- a/Pythonwin/pywin/mfc/window.py +++ b/Pythonwin/pywin/mfc/window.py @@ -1,7 +1,8 @@ # The MFCish window classes. -from . import object -import win32ui import win32con +import win32ui + +from . import object class Wnd(object.CmdTarget): diff --git a/Pythonwin/pywin/scintilla/IDLEenvironment.py b/Pythonwin/pywin/scintilla/IDLEenvironment.py index 8b325ef936..b1db509316 100644 --- a/Pythonwin/pywin/scintilla/IDLEenvironment.py +++ b/Pythonwin/pywin/scintilla/IDLEenvironment.py @@ -2,13 +2,13 @@ # (at least as far as most IDLE extensions are concerned) import string -import win32api -import win32ui -import win32con import sys -from pywin.mfc.dialog import GetSimpleInput +import win32api +import win32con +import win32ui from pywin import default_scintilla_encoding +from pywin.mfc.dialog import GetSimpleInput wordchars = string.ascii_uppercase + string.ascii_lowercase + string.digits @@ -573,7 +573,8 @@ def __init__(self, control): def IDLETest(extension): - import sys, os + import os + import sys modname = "pywin.idle." + extension __import__(modname) diff --git a/Pythonwin/pywin/scintilla/bindings.py b/Pythonwin/pywin/scintilla/bindings.py index 703a20acfc..785bd42a13 100644 --- a/Pythonwin/pywin/scintilla/bindings.py +++ b/Pythonwin/pywin/scintilla/bindings.py @@ -1,11 +1,10 @@ -from . import IDLEenvironment -import string -import win32ui +import traceback + import win32api import win32con -from . import keycodes -import sys -import traceback +import win32ui + +from . import IDLEenvironment, keycodes HANDLER_ARGS_GUESS = 0 HANDLER_ARGS_NATIVE = 1 diff --git a/Pythonwin/pywin/scintilla/config.py b/Pythonwin/pywin/scintilla/config.py index 81933b2ac7..9a1b210e9c 100644 --- a/Pythonwin/pywin/scintilla/config.py +++ b/Pythonwin/pywin/scintilla/config.py @@ -8,20 +8,20 @@ # .py file, and put the config info in a docstring. Then # pass a CStringIO file (rather than a filename) to the # config manager. -import sys -import string -from . import keycodes +import glob +import importlib.util import marshal -import stat import os -import types +import stat +import sys import traceback -import pywin -import glob -import importlib.util +import types +import pywin import win32api +from . import keycodes + debugging = 0 if debugging: import win32traceutil # Some trace statements fire before the interactive window is open. diff --git a/Pythonwin/pywin/scintilla/configui.py b/Pythonwin/pywin/scintilla/configui.py index 2cc0be5601..8b6157b604 100644 --- a/Pythonwin/pywin/scintilla/configui.py +++ b/Pythonwin/pywin/scintilla/configui.py @@ -1,14 +1,13 @@ -from pywin.mfc import dialog import win32api import win32con import win32ui -import copy -import string -from . import scintillacon +from pywin.mfc import dialog # Used to indicate that style should use default color from win32con import CLR_INVALID +from . import scintillacon + ###################################################### # Property Page for syntax formatting options diff --git a/Pythonwin/pywin/scintilla/control.py b/Pythonwin/pywin/scintilla/control.py index 82972d8133..460b168645 100644 --- a/Pythonwin/pywin/scintilla/control.py +++ b/Pythonwin/pywin/scintilla/control.py @@ -4,15 +4,16 @@ # a "standard" MFC edit control (eg, control.GetTextLength(), control.GetSel() # plus many Scintilla specific features (eg control.SCIAddStyledText()) -from pywin.mfc import window -from pywin import default_scintilla_encoding -import win32con -import win32ui -import win32api import array -import struct -import string import os +import struct + +import win32api +import win32con +import win32ui +from pywin import default_scintilla_encoding +from pywin.mfc import window + from . import scintillacon # Load Scintilla.dll to get access to the control. diff --git a/Pythonwin/pywin/scintilla/document.py b/Pythonwin/pywin/scintilla/document.py index df026bb3ca..cddb442c11 100644 --- a/Pythonwin/pywin/scintilla/document.py +++ b/Pythonwin/pywin/scintilla/document.py @@ -1,12 +1,13 @@ +import codecs +import re +import string + +import win32con import win32ui -from pywin.mfc import docview from pywin import default_scintilla_encoding +from pywin.mfc import docview + from . import scintillacon -import win32con -import string -import os -import codecs -import re crlf_bytes = "\r\n".encode("ascii") lf_bytes = "\n".encode("ascii") diff --git a/Pythonwin/pywin/scintilla/find.py b/Pythonwin/pywin/scintilla/find.py index bdee4cd334..e1d21a5bce 100644 --- a/Pythonwin/pywin/scintilla/find.py +++ b/Pythonwin/pywin/scintilla/find.py @@ -1,9 +1,10 @@ # find.py - Find and Replace -import win32con, win32api -import win32ui -from pywin.mfc import dialog import afxres +import win32api +import win32con +import win32ui from pywin.framework import scriptutils +from pywin.mfc import dialog FOUND_NOTHING = 0 FOUND_NORMAL = 1 diff --git a/Pythonwin/pywin/scintilla/formatter.py b/Pythonwin/pywin/scintilla/formatter.py index 98dd5e53aa..56100ccfcf 100644 --- a/Pythonwin/pywin/scintilla/formatter.py +++ b/Pythonwin/pywin/scintilla/formatter.py @@ -1,10 +1,11 @@ # Does Python source formatting for Scintilla controls. -import win32ui +import array +import string + import win32api import win32con -import winerror -import string -import array +import win32ui + from . import scintillacon WM_KICKIDLE = 0x036A @@ -16,7 +17,9 @@ if debugging: # Output must go to another process else the result of # the printing itself will trigger again trigger a trace. - import sys, win32traceutil, win32trace + + import win32trace + import win32traceutil def trace(*args): win32trace.write(" ".join(map(str, args)) + "\n") diff --git a/Pythonwin/pywin/scintilla/keycodes.py b/Pythonwin/pywin/scintilla/keycodes.py index 9283ae65ce..badcef3e70 100644 --- a/Pythonwin/pywin/scintilla/keycodes.py +++ b/Pythonwin/pywin/scintilla/keycodes.py @@ -1,6 +1,5 @@ -import string -import win32con import win32api +import win32con import win32ui MAPVK_VK_TO_CHAR = 2 diff --git a/Pythonwin/pywin/scintilla/view.py b/Pythonwin/pywin/scintilla/view.py index 5591327324..3783666fc8 100644 --- a/Pythonwin/pywin/scintilla/view.py +++ b/Pythonwin/pywin/scintilla/view.py @@ -1,23 +1,20 @@ # A general purpose MFC CCtrlView view that uses Scintilla. -from . import control -from . import IDLEenvironment # IDLE emulation. -from pywin.mfc import docview -from pywin.mfc import dialog -from . import scintillacon -import win32con -import win32ui -import afxres -import string import array +import os +import re +import string +import struct import sys -import types + import __main__ # for attribute lookup -from . import bindings -from . import keycodes -import struct -import re -import os +import afxres +import win32con +import win32ui +from pywin.mfc import dialog, docview + +from . import IDLEenvironment # IDLE emulation. +from . import bindings, control, keycodes, scintillacon PRINTDLGORD = 1538 IDC_PRINT_MAG_EDIT = 1010 diff --git a/Pythonwin/pywin/test/test_pywin.py b/Pythonwin/pywin/test/test_pywin.py index a367b70680..02cdcaca8e 100644 --- a/Pythonwin/pywin/test/test_pywin.py +++ b/Pythonwin/pywin/test/test_pywin.py @@ -365,6 +365,7 @@ def test_ia(self): def test_docedit(self): import tempfile + import pywin.scintilla.IDLEenvironment ##doc = pywin.framework.editor.editorTemplate.OpenDocumentFile(None) diff --git a/Pythonwin/pywin/tools/TraceCollector.py b/Pythonwin/pywin/tools/TraceCollector.py index 48085b829e..5800488b91 100644 --- a/Pythonwin/pywin/tools/TraceCollector.py +++ b/Pythonwin/pywin/tools/TraceCollector.py @@ -1,6 +1,9 @@ # win32traceutil like utility for Pythonwin import _thread -import win32trace, win32event, win32api + +import win32api +import win32event +import win32trace from pywin.framework import winout outputWindow = None diff --git a/Pythonwin/pywin/tools/browseProjects.py b/Pythonwin/pywin/tools/browseProjects.py index 55978010ec..e3255579a1 100644 --- a/Pythonwin/pywin/tools/browseProjects.py +++ b/Pythonwin/pywin/tools/browseProjects.py @@ -1,12 +1,17 @@ -import regutil, os -from . import hierlist -import win32con, win32ui, win32api -import commctrl -from pywin.mfc import dialog import glob +import os import pyclbr -import pywin.framework.scriptutils + import afxres +import commctrl +import pywin.framework.scriptutils +import regutil +import win32api +import win32con +import win32ui +from pywin.mfc import dialog + +from . import hierlist class HLIErrorItem(hierlist.HierListItem): diff --git a/Pythonwin/pywin/tools/browser.py b/Pythonwin/pywin/tools/browser.py index c85e76b884..9d9a193db7 100644 --- a/Pythonwin/pywin/tools/browser.py +++ b/Pythonwin/pywin/tools/browser.py @@ -7,6 +7,7 @@ # >>> browser.Browse(your_module) import sys import types + import __main__ import win32ui from pywin.mfc import dialog @@ -378,9 +379,9 @@ def ShowObject(object, title): # And some mods for a sizable dialog from Sam Rushing! -import win32con -import win32api import commctrl +import win32api +import win32con class dynamic_browser(dialog.Dialog): diff --git a/Pythonwin/pywin/tools/hierlist.py b/Pythonwin/pywin/tools/hierlist.py index 6c64bdce95..a60b732472 100644 --- a/Pythonwin/pywin/tools/hierlist.py +++ b/Pythonwin/pywin/tools/hierlist.py @@ -14,13 +14,13 @@ # to provide maximum flexibility (but with extra work). import sys -import win32ui -import win32con -import win32api -from win32api import RGB -from pywin.mfc import object, window, docview, dialog import commctrl +import win32api +import win32con +import win32ui +from pywin.mfc import dialog, docview, object, window +from win32api import RGB # helper to get the text of an arbitary item diff --git a/Pythonwin/pywin/tools/regedit.py b/Pythonwin/pywin/tools/regedit.py index 59297c1d92..b94d3050fb 100644 --- a/Pythonwin/pywin/tools/regedit.py +++ b/Pythonwin/pywin/tools/regedit.py @@ -1,9 +1,13 @@ # Regedit - a Registry Editor for Python -import win32api, win32ui, win32con, commctrl -from pywin.mfc import window, docview, dialog -from . import hierlist + +import commctrl import regutil -import string +import win32api +import win32con +import win32ui +from pywin.mfc import dialog, docview, window + +from . import hierlist def SafeApply(fn, args, err_desc=""): diff --git a/Pythonwin/pywin/tools/regpy.py b/Pythonwin/pywin/tools/regpy.py index f290e52ff8..11ad63af56 100644 --- a/Pythonwin/pywin/tools/regpy.py +++ b/Pythonwin/pywin/tools/regpy.py @@ -1,8 +1,8 @@ # (sort-of) Registry editor -import win32ui +import commctrl import dialog import win32con -import commctrl +import win32ui class RegistryControl: diff --git a/adodbapi/__init__.py b/adodbapi/__init__.py index 81db109804..0d769e058d 100644 --- a/adodbapi/__init__.py +++ b/adodbapi/__init__.py @@ -6,25 +6,28 @@ import sys import time -from .apibase import apilevel, threadsafety, paramstyle +from .adodbapi import Connection, Cursor, __version__, connect, dateconverter from .apibase import ( - Warning, - Error, - InterfaceError, + BINARY, + DATETIME, + NUMBER, + ROWID, + STRING, DatabaseError, DataError, - OperationalError, + Error, + FetchFailedError, IntegrityError, -) -from .apibase import ( + InterfaceError, InternalError, - ProgrammingError, NotSupportedError, - FetchFailedError, + OperationalError, + ProgrammingError, + Warning, + apilevel, + paramstyle, + threadsafety, ) -from .apibase import NUMBER, STRING, BINARY, DATETIME, ROWID - -from .adodbapi import connect, Connection, __version__, dateconverter, Cursor def Binary(aString): diff --git a/adodbapi/adodbapi.py b/adodbapi/adodbapi.py index a37b958e17..8f7c045ea7 100644 --- a/adodbapi/adodbapi.py +++ b/adodbapi/adodbapi.py @@ -31,15 +31,13 @@ __version__ = "2.6.2.0" version = "adodbapi v" + __version__ -import sys import copy import decimal import os +import sys import weakref -from . import process_connect_string -from . import ado_consts as adc -from . import apibase as api +from . import ado_consts as adc, apibase as api, process_connect_string try: verbose = int(os.environ["ADODBAPI_VERBOSE"]) @@ -51,9 +49,16 @@ # --- define objects to smooth out IronPython <-> CPython differences onWin32 = False # assume the worst if api.onIronPython: - from System import Activator, Type, DBNull, DateTime, Array, Byte - from System import Decimal as SystemDecimal from clr import Reference + from System import ( + Activator, + Array, + Byte, + DateTime, + DBNull, + Decimal as SystemDecimal, + Type, + ) def Dispatch(dispatch): type = Type.GetTypeFromProgID(dispatch) @@ -64,9 +69,9 @@ def getIndexedValue(obj, index): else: # try pywin32 try: - import win32com.client import pythoncom import pywintypes + import win32com.client onWin32 = True diff --git a/adodbapi/apibase.py b/adodbapi/apibase.py index 4c3c026d7d..50770c96ee 100644 --- a/adodbapi/apibase.py +++ b/adodbapi/apibase.py @@ -5,11 +5,11 @@ * http://sourceforge.net/projects/adodbapi """ -import sys -import time import datetime import decimal import numbers +import sys +import time # noinspection PyUnresolvedReferences from . import ado_consts as adc @@ -19,7 +19,7 @@ onIronPython = sys.platform == "cli" if onIronPython: # we need type definitions for odd data we may need to convert # noinspection PyUnresolvedReferences - from System import DBNull, DateTime + from System import DateTime, DBNull NullTypes = (type(None), DBNull) else: @@ -524,9 +524,9 @@ def cvtUnusual(variant): if verbose > 1: sys.stderr.write("Conversion called for Unusual data=%s\n" % repr(variant)) if isinstance(variant, DateTime): # COMdate or System.Date - from .adodbapi import ( + from .adodbapi import ( # this will only be called when adodbapi is in use, and very rarely dateconverter, - ) # this will only be called when adodbapi is in use, and very rarely + ) return dateconverter.DateObjectFromCOMDate(variant) return variant # cannot find conversion function -- just give the data to the user diff --git a/adodbapi/examples/db_print.py b/adodbapi/examples/db_print.py index 27f1e5e94e..c0eb83ee4d 100644 --- a/adodbapi/examples/db_print.py +++ b/adodbapi/examples/db_print.py @@ -1,6 +1,7 @@ """ db_print.py -- a simple demo for ADO database reads.""" import sys + import adodbapi.ado_consts as adc cmd_args = ("filename", "table_name") diff --git a/adodbapi/examples/db_table_names.py b/adodbapi/examples/db_table_names.py index ca33508c79..2d7bf9df0d 100644 --- a/adodbapi/examples/db_table_names.py +++ b/adodbapi/examples/db_table_names.py @@ -1,5 +1,6 @@ """ db_table_names.py -- a simple demo for ADO database table listing.""" import sys + import adodbapi try: diff --git a/adodbapi/examples/xls_read.py b/adodbapi/examples/xls_read.py index 8dc96fe4f3..10bcc57e6b 100644 --- a/adodbapi/examples/xls_read.py +++ b/adodbapi/examples/xls_read.py @@ -1,4 +1,5 @@ import sys + import adodbapi try: diff --git a/adodbapi/examples/xls_write.py b/adodbapi/examples/xls_write.py index 4dc2adcc4d..38baefd812 100644 --- a/adodbapi/examples/xls_write.py +++ b/adodbapi/examples/xls_write.py @@ -1,6 +1,7 @@ -import adodbapi import datetime +import adodbapi + try: import adodbapi.is64bit as is64bit diff --git a/adodbapi/process_connect_string.py b/adodbapi/process_connect_string.py index ea2b4fb3d2..3c3f9e7afa 100644 --- a/adodbapi/process_connect_string.py +++ b/adodbapi/process_connect_string.py @@ -60,7 +60,8 @@ def macro_call(macro_name, args, kwargs): elif ( macro_name == "find_temp_test_path" ): # helper function for testing ado operation -- undocumented - import tempfile, os + import os + import tempfile return new_key, os.path.join( tempfile.gettempdir(), "adodbapi_test", args[1] diff --git a/adodbapi/remote.py b/adodbapi/remote.py index 2b98badb98..ae22b5a7ea 100644 --- a/adodbapi/remote.py +++ b/adodbapi/remote.py @@ -30,11 +30,11 @@ __version__ = "2.6.0.4" version = "adodbapi.remote v" + __version__ +import array +import datetime import os import sys -import array import time -import datetime # Pyro4 is required for server and remote operation --> https://pypi.python.org/pypi/Pyro4/ try: diff --git a/adodbapi/remote/server.py b/adodbapi/remote/server.py index 15727b0a47..3cce1d8ab4 100644 --- a/adodbapi/remote/server.py +++ b/adodbapi/remote/server.py @@ -32,11 +32,11 @@ PYRO_COMMTIMEOUT = 40 # to be larger than the default database timeout SERVICE_NAME = "ado.connection" +import array +import datetime import os import sys import time -import array -import datetime # Pyro4 is required for server and remote operation --> https://pypi.python.org/pypi/Pyro4/ try: @@ -44,8 +44,8 @@ except ImportError: print('* * * Sorry, server operation requires Pyro4. Please "pip import" it.') exit(11) -import adodbapi.apibase as api import adodbapi +import adodbapi.apibase as api import adodbapi.process_connect_string makeByteBuffer = bytes diff --git a/adodbapi/setup.py b/adodbapi/setup.py index d7b530be8b..d25869adf9 100644 --- a/adodbapi/setup.py +++ b/adodbapi/setup.py @@ -39,12 +39,10 @@ break a.close() -import sys - def setup_package(): - from distutils.core import setup from distutils.command.build_py import build_py + from distutils.core import setup setup( cmdclass={"build_py": build_py}, diff --git a/adodbapi/test/adodbapitest.py b/adodbapi/test/adodbapitest.py index e60014c662..e5b3dc1946 100644 --- a/adodbapi/test/adodbapitest.py +++ b/adodbapi/test/adodbapitest.py @@ -21,13 +21,13 @@ Updates by Vernon Cole """ -import unittest -import sys +import copy import datetime import decimal -import copy import random import string +import sys +import unittest try: import win32com.client @@ -45,7 +45,6 @@ import adodbapi import adodbapi.apibase as api - try: import adodbapi.ado_consts as ado_consts except ImportError: # we are doing a shortcut import as a module -- so diff --git a/adodbapi/test/adodbapitestconfig.py b/adodbapi/test/adodbapitestconfig.py index c2a41898ef..98f254440e 100644 --- a/adodbapi/test/adodbapitestconfig.py +++ b/adodbapi/test/adodbapitestconfig.py @@ -12,8 +12,8 @@ # # -- the things you need to change are below it. # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # import platform -import sys import random +import sys import is64bit import setuptestframework diff --git a/adodbapi/test/dbapi20.py b/adodbapi/test/dbapi20.py index 1ac4982302..e378b1941d 100644 --- a/adodbapi/test/dbapi20.py +++ b/adodbapi/test/dbapi20.py @@ -14,9 +14,9 @@ __version__ = "$Revision: 1.15.0 $"[11:-2] __author__ = "Stuart Bishop " -import unittest -import time import sys +import time +import unittest if sys.version[0] >= "3": # python 3.x _BaseException = Exception diff --git a/adodbapi/test/setuptestframework.py b/adodbapi/test/setuptestframework.py index 2f3f7d2dbf..83fe5ca9db 100644 --- a/adodbapi/test/setuptestframework.py +++ b/adodbapi/test/setuptestframework.py @@ -2,9 +2,9 @@ # Configure this in order to run the testcases. "setuptestframework.py v 2.6.0.8" import os +import shutil import sys import tempfile -import shutil try: OSErrors = (WindowsError, OSError) @@ -81,8 +81,8 @@ def makemdb(testfolder, mdb_name): print("using JET database=", _accessdatasource) else: try: - from win32com.client.gencache import EnsureDispatch from win32com.client import constants + from win32com.client.gencache import EnsureDispatch win32 = True except ImportError: # perhaps we are running IronPython diff --git a/adodbapi/test/test_adodbapi_dbapi20.py b/adodbapi/test/test_adodbapi_dbapi20.py index c7952d0295..31bbae4827 100644 --- a/adodbapi/test/test_adodbapi_dbapi20.py +++ b/adodbapi/test/test_adodbapi_dbapi20.py @@ -1,8 +1,8 @@ print("This module depends on the dbapi20 compliance tests created by Stuart Bishop") print("(see db-sig mailing list history for info)") import platform -import unittest import sys +import unittest import dbapi20 import setuptestframework diff --git a/com/win32com/__init__.py b/com/win32com/__init__.py index edf2d267b5..4832d9e1ff 100644 --- a/com/win32com/__init__.py +++ b/com/win32com/__init__.py @@ -2,8 +2,11 @@ # Initialization for the win32com package # -import win32api, sys, os +import os +import sys + import pythoncom +import win32api # flag if we are in a "frozen" build. _frozen = getattr(sys, "frozen", 1 == 0) diff --git a/com/win32com/client/__init__.py b/com/win32com/client/__init__.py index 8a04bd4f65..91b4b303b5 100644 --- a/com/win32com/client/__init__.py +++ b/com/win32com/client/__init__.py @@ -6,12 +6,13 @@ # dispatch object, the known class will be used. This contrasts # with dynamic.Dispatch behaviour, where dynamic objects are always used. -import pythoncom -from . import dynamic -from . import gencache import sys + +import pythoncom import pywintypes +from . import dynamic, gencache + _PyIDispatchType = pythoncom.TypeIIDs[pythoncom.IID_IDispatch] diff --git a/com/win32com/client/build.py b/com/win32com/client/build.py index 834f340ef0..ce4e2e4aeb 100644 --- a/com/win32com/client/build.py +++ b/com/win32com/client/build.py @@ -16,14 +16,14 @@ # # OleItem, DispatchItem, MapEntry, BuildCallList() is used by makepy -import sys +import datetime import string +import sys from keyword import iskeyword import pythoncom -from pywintypes import TimeType import winerror -import datetime +from pywintypes import TimeType # It isn't really clear what the quoting rules are in a C/IDL string and diff --git a/com/win32com/client/combrowse.py b/com/win32com/client/combrowse.py index f4ffc8349e..10eeaedfdb 100644 --- a/com/win32com/client/combrowse.py +++ b/com/win32com/client/combrowse.py @@ -22,12 +22,14 @@ work. """ -import win32con -import win32api, win32ui import sys + import pythoncom -from win32com.client import util +import win32api +import win32con +import win32ui from pywin.tools import browser +from win32com.client import util class HLIRoot(browser.HLIPythonObject): diff --git a/com/win32com/client/connect.py b/com/win32com/client/connect.py index d9f4e0b678..24788204ec 100644 --- a/com/win32com/client/connect.py +++ b/com/win32com/client/connect.py @@ -1,5 +1,6 @@ """Utilities for working with Connections""" -import win32com.server.util, pythoncom +import pythoncom +import win32com.server.util class SimpleConnection: diff --git a/com/win32com/client/dynamic.py b/com/win32com/client/dynamic.py index 6964234c14..449ad928fd 100644 --- a/com/win32com/client/dynamic.py +++ b/com/win32com/client/dynamic.py @@ -15,17 +15,15 @@ >>> xl.Visible = 1 # The Excel window becomes visible. """ -import sys import traceback import types -import pythoncom +import pythoncom # Needed as code we eval() references it. +import win32com.client import winerror -from . import build - from pywintypes import IIDType -import win32com.client # Needed as code we eval() references it. +from . import build debugging = 0 # General debugging debugging_attr = 0 # Debugging dynamic attribute lookups. diff --git a/com/win32com/client/gencache.py b/com/win32com/client/gencache.py index bacab4a0d7..99e9c6cbd1 100644 --- a/com/win32com/client/gencache.py +++ b/com/win32com/client/gencache.py @@ -20,15 +20,18 @@ Currently just uses a pickled dictionary, but should used some sort of indexed file. Maybe an OLE2 compound file, or a bsddb file? """ -import pywintypes, os, sys -import pythoncom -import win32com, win32com.client import glob -import traceback -from . import CLSIDToClass -import operator +import os +import sys from importlib import reload +import pythoncom +import pywintypes +import win32com +import win32com.client + +from . import CLSIDToClass + bForDemandDefault = 0 # Default value of bForDemand - toggle this to change the world - see also makepy.py # The global dictionary diff --git a/com/win32com/client/genpy.py b/com/win32com/client/genpy.py index 2be384252a..3eba075fa3 100644 --- a/com/win32com/client/genpy.py +++ b/com/win32com/client/genpy.py @@ -16,9 +16,10 @@ import os import sys import time -import win32com import pythoncom +import win32com + from . import build error = "makepy.error" diff --git a/com/win32com/client/makepy.py b/com/win32com/client/makepy.py index e1952571c5..041f18a457 100644 --- a/com/win32com/client/makepy.py +++ b/com/win32com/client/makepy.py @@ -66,9 +66,12 @@ """ -import sys, os, importlib, pythoncom -from win32com.client import genpy, selecttlb, gencache -from win32com.client import Dispatch +import importlib +import os +import sys + +import pythoncom +from win32com.client import Dispatch, gencache, genpy, selecttlb bForDemandDefault = 0 # Default value of bForDemand - toggle this to change the world - see also gencache.py @@ -152,7 +155,8 @@ def LogWarning(self, desc): class GUIProgress(SimpleProgress): def __init__(self, verboseLevel): # Import some modules we need to we can trap failure now. - import win32ui, pywin + import pywin # nopycln: import + import win32ui SimpleProgress.__init__(self, verboseLevel) self.dialog = None diff --git a/com/win32com/client/selecttlb.py b/com/win32com/client/selecttlb.py index f9f0b1ce37..bb21a42915 100644 --- a/com/win32com/client/selecttlb.py +++ b/com/win32com/client/selecttlb.py @@ -1,7 +1,9 @@ """Utilities for selecting and enumerating the Type Libraries installed on the system """ -import win32api, win32con, pythoncom +import pythoncom +import win32api +import win32con class TypelibSpec: diff --git a/com/win32com/client/tlbrowse.py b/com/win32com/client/tlbrowse.py index fbf96e68ab..acc0028167 100644 --- a/com/win32com/client/tlbrowse.py +++ b/com/win32com/client/tlbrowse.py @@ -1,8 +1,8 @@ -import win32ui -import win32con -import win32api import commctrl import pythoncom +import win32api +import win32con +import win32ui from pywin.mfc import dialog diff --git a/com/win32com/demos/connect.py b/com/win32com/demos/connect.py index b5b2da5872..ed7f51c9cd 100644 --- a/com/win32com/demos/connect.py +++ b/com/win32com/demos/connect.py @@ -6,10 +6,10 @@ # is cheated on - so this is still working as a fully-fledged server. import pythoncom -import win32com.server.util import win32com.server.connect -from win32com.server.exception import Exception +import win32com.server.util from pywin32_testutil import str2bytes +from win32com.server.exception import Exception # This is the IID of the Events interface both Client and Server support. IID_IConnectDemoEvents = pythoncom.MakeIID("{A4988850-49C3-11d0-AE5D-52342E000000}") @@ -76,7 +76,8 @@ def CheckEvent(server, client, val, verbose): # In the real world, it is likely that the code controlling the server # will be in the same class as that getting the notifications. def test(verbose=0): - import win32com.client.dynamic, win32com.client.connect + import win32com.client.connect + import win32com.client.dynamic import win32com.server.policy server = win32com.client.dynamic.Dispatch( diff --git a/com/win32com/demos/eventsApartmentThreaded.py b/com/win32com/demos/eventsApartmentThreaded.py index 2b7686b8c7..ae8e70faef 100644 --- a/com/win32com/demos/eventsApartmentThreaded.py +++ b/com/win32com/demos/eventsApartmentThreaded.py @@ -20,15 +20,13 @@ # running this sample you will see an IE Windows briefly appear, but # vanish without ever being repainted. -import sys -import os -import win32com.client -import win32api -import win32event +import time # sys.coinit_flags not set, so pythoncom initializes apartment-threaded. import pythoncom -import time +import win32api +import win32com.client +import win32event class ExplorerEvents: diff --git a/com/win32com/demos/eventsFreeThreaded.py b/com/win32com/demos/eventsFreeThreaded.py index 2b0c4ca19e..2fc04d8294 100644 --- a/com/win32com/demos/eventsFreeThreaded.py +++ b/com/win32com/demos/eventsFreeThreaded.py @@ -22,12 +22,11 @@ sys.coinit_flags = 0 # specify free threading -import os + +import pythoncom import win32api -import win32event import win32com.client -import pythoncom -import time +import win32event # The print statements indicate that COM has actually started another thread diff --git a/com/win32com/demos/excelAddin.py b/com/win32com/demos/excelAddin.py index 5606ef18be..96f6cff8ab 100644 --- a/com/win32com/demos/excelAddin.py +++ b/com/win32com/demos/excelAddin.py @@ -46,13 +46,12 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +import sys + +import pythoncom from win32com import universal +from win32com.client import Dispatch, DispatchWithEvents, constants, gencache from win32com.server.exception import COMException -from win32com.client import gencache, DispatchWithEvents -import winerror -import pythoncom -from win32com.client import constants, Dispatch -import sys # Support for COM objects we use. gencache.EnsureModule( @@ -70,8 +69,8 @@ class ButtonEvent: def OnClick(self, button, cancel): - import win32ui # Possible, but not necessary, to use a Pythonwin GUI - import win32con + import win32con # Possible, but not necessary, to use a Pythonwin GUI + import win32ui win32ui.MessageBox("Hello from Python", "Python Test", win32con.MB_OKCANCEL) return cancel diff --git a/com/win32com/demos/excelRTDServer.py b/com/win32com/demos/excelRTDServer.py index f8ae7c0f58..c50e1ac786 100644 --- a/com/win32com/demos/excelRTDServer.py +++ b/com/win32com/demos/excelRTDServer.py @@ -30,15 +30,15 @@ # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE # OF THIS SOFTWARE. +import datetime # For the example classes... +import threading + import pythoncom import win32com.client from win32com import universal from win32com.client import gencache from win32com.server.exception import COMException -import threading -import datetime # For the example classes... - # Typelib info for version 10 - aka Excel XP. # This is the minimum version of excel that we can work with as this is when # Microsoft introduced these interfaces. diff --git a/com/win32com/demos/iebutton.py b/com/win32com/demos/iebutton.py index f7ff5feb1d..bc3ce99bf8 100644 --- a/com/win32com/demos/iebutton.py +++ b/com/win32com/demos/iebutton.py @@ -25,14 +25,13 @@ """ # imports section -import sys, os -from win32com import universal -from win32com.client import gencache, DispatchWithEvents, Dispatch -from win32com.client import constants, getevents -import win32com.server.register -import win32com + import pythoncom 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. @@ -41,9 +40,9 @@ except win32api.error: import win32traceutil -from win32com.axcontrol import axcontrol +import array -import array, struct +from win32com.axcontrol import axcontrol # ensure we know the ms internet controls typelib so we have access to IWebBrowser2 later on win32com.client.gencache.EnsureModule("{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}", 0, 1, 1) diff --git a/com/win32com/demos/ietoolbar.py b/com/win32com/demos/ietoolbar.py index b06dd0efe4..084db3c1ae 100644 --- a/com/win32com/demos/ietoolbar.py +++ b/com/win32com/demos/ietoolbar.py @@ -16,17 +16,16 @@ """ # imports section -import sys, os -from win32com import universal -from win32com.client import gencache, DispatchWithEvents, Dispatch -from win32com.client import constants, getevents -import win32com -import pythoncom +import sys import winreg +import pythoncom +import win32com +from win32com import universal +from win32com.axcontrol import axcontrol +from win32com.client import Dispatch, DispatchWithEvents, constants, gencache, getevents from win32com.shell import shell from win32com.shell.shellcon import * -from win32com.axcontrol import axcontrol try: # try to get styles (winxp) @@ -34,11 +33,13 @@ except: # import default module (win2k and lower) import win32gui -import win32ui -import win32con -import commctrl -import array, struct +import array +import struct + +import commctrl +import win32con +import win32ui # ensure we know the ms internet controls typelib so we have access to IWebBrowser2 later on win32com.client.gencache.EnsureModule("{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}", 0, 1, 1) diff --git a/com/win32com/demos/outlookAddin.py b/com/win32com/demos/outlookAddin.py index 41f1ee1d65..9433596d60 100644 --- a/com/win32com/demos/outlookAddin.py +++ b/com/win32com/demos/outlookAddin.py @@ -25,13 +25,12 @@ # the addin to not automatically load next time Outlook starts. To # correct this, simply re-register the addin (see above) +import sys + +import pythoncom from win32com import universal +from win32com.client import DispatchWithEvents, constants, gencache from win32com.server.exception import COMException -from win32com.client import gencache, DispatchWithEvents -import winerror -import pythoncom -from win32com.client import constants -import sys # Support for COM objects we use. gencache.EnsureModule( diff --git a/com/win32com/demos/trybag.py b/com/win32com/demos/trybag.py index 74ae54ef52..3d3918b6c2 100644 --- a/com/win32com/demos/trybag.py +++ b/com/win32com/demos/trybag.py @@ -1,6 +1,5 @@ import pythoncom -from win32com.server import util -from win32com.server import exception +from win32com.server import exception, util VT_EMPTY = pythoncom.VT_EMPTY diff --git a/com/win32com/makegw/makegw.py b/com/win32com/makegw/makegw.py index 067d444f14..8d2e83d654 100644 --- a/com/win32com/makegw/makegw.py +++ b/com/win32com/makegw/makegw.py @@ -47,6 +47,7 @@ """ import re + from . import makegwparse diff --git a/com/win32com/server/connect.py b/com/win32com/server/connect.py index 4509aea54f..5c9a2dfe4a 100644 --- a/com/win32com/server/connect.py +++ b/com/win32com/server/connect.py @@ -3,10 +3,11 @@ A collection of helpers for server side connection points. """ import pythoncom -from .exception import Exception +import win32com.server.util import winerror from win32com import olectl -import win32com.server.util + +from .exception import Exception # Methods implemented by the interfaces. IConnectionPointContainer_methods = ["EnumConnectionPoints", "FindConnectionPoint"] diff --git a/com/win32com/server/dispatcher.py b/com/win32com/server/dispatcher.py index f6d58b9ac2..ac98312500 100644 --- a/com/win32com/server/dispatcher.py +++ b/com/win32com/server/dispatcher.py @@ -2,13 +2,16 @@ Please see policy.py for a discussion on dispatchers and policies """ -import pythoncom, traceback, win32api +import traceback from sys import exc_info +import pythoncom +import win32api +import win32com + # from win32com.server.exception import IsCOMServerException from win32com.util import IIDToInterfaceName -import win32com class DispatcherBase: diff --git a/com/win32com/server/exception.py b/com/win32com/server/exception.py index 2a63d51110..e7f4d08060 100644 --- a/com/win32com/server/exception.py +++ b/com/win32com/server/exception.py @@ -12,7 +12,9 @@ This module provides a class which provides the necessary attributes. """ -import sys, pythoncom +import sys + +import pythoncom # Note that we derive from com_error, which derives from exceptions.Exception diff --git a/com/win32com/server/policy.py b/com/win32com/server/policy.py index 88ebf0a723..8105e180a2 100644 --- a/com/win32com/server/policy.py +++ b/com/win32com/server/policy.py @@ -68,12 +68,14 @@ """ __author__ = "Greg Stein and Mark Hammond" -import win32api -import winerror import sys import types + +import pythoncom import pywintypes -import win32con, pythoncom +import win32api +import win32con +import winerror # Import a few important constants to speed lookups. from pythoncom import ( @@ -81,15 +83,15 @@ DISPATCH_PROPERTYGET, DISPATCH_PROPERTYPUT, DISPATCH_PROPERTYPUTREF, - DISPID_UNKNOWN, - DISPID_VALUE, - DISPID_PROPERTYPUT, - DISPID_NEWENUM, - DISPID_EVALUATE, + DISPID_COLLECT, DISPID_CONSTRUCTOR, DISPID_DESTRUCTOR, - DISPID_COLLECT, + DISPID_EVALUATE, + DISPID_NEWENUM, + DISPID_PROPERTYPUT, DISPID_STARTENUM, + DISPID_UNKNOWN, + DISPID_VALUE, ) S_OK = 0 diff --git a/com/win32com/server/register.py b/com/win32com/server/register.py index e56db20fd9..ae513c754f 100644 --- a/com/win32com/server/register.py +++ b/com/win32com/server/register.py @@ -6,12 +6,13 @@ construct the necessary Python object, and dispatch COM events. """ +import os import sys + +import pythoncom import win32api import win32con -import pythoncom import winerror -import os CATID_PythonCOMServer = "{B3EF80D0-68E2-11D0-A689-00C04FD658FF}" @@ -534,12 +535,14 @@ def UnregisterInfoClasses(*classes, **flags): # Attempt to 're-execute' our current process with elevation. def ReExecuteElevated(flags): - from win32com.shell.shell import ShellExecuteEx - from win32com.shell import shellcon - import win32process, win32event - import winxpgui # we've already checked we are running XP above import tempfile + import win32event # we've already checked we are running XP above + import win32process + import winxpgui + from win32com.shell import shellcon + from win32com.shell.shell import ShellExecuteEx + if not flags["quiet"]: print("Requesting elevation and retrying...") new_params = " ".join(['"' + a + '"' for a in sys.argv]) diff --git a/com/win32com/server/util.py b/com/win32com/server/util.py index 3f2be006d2..c46dd375d9 100644 --- a/com/win32com/server/util.py +++ b/com/win32com/server/util.py @@ -1,8 +1,9 @@ """ General Server side utilities """ import pythoncom -from . import policy import winerror + +from . import policy from .exception import COMException diff --git a/com/win32com/servers/dictionary.py b/com/win32com/servers/dictionary.py index b743e71d44..28596b81a1 100644 --- a/com/win32com/servers/dictionary.py +++ b/com/win32com/servers/dictionary.py @@ -31,14 +31,13 @@ next """ + import pythoncom -from win32com.server import util, policy -from win32com.server.exception import COMException -import winerror -import types import pywintypes - +import winerror from pythoncom import DISPATCH_METHOD, DISPATCH_PROPERTYGET +from win32com.server import policy, util +from win32com.server.exception import COMException from winerror import S_OK diff --git a/com/win32com/servers/interp.py b/com/win32com/servers/interp.py index 4ae6ce79c3..b15cede763 100644 --- a/com/win32com/servers/interp.py +++ b/com/win32com/servers/interp.py @@ -11,8 +11,8 @@ and call its methods! """ -from win32com.server.exception import Exception import winerror +from win32com.server.exception import Exception # Expose the Python interpreter. diff --git a/com/win32com/servers/perfmon.py b/com/win32com/servers/perfmon.py index aea79f5a22..861c694097 100644 --- a/com/win32com/servers/perfmon.py +++ b/com/win32com/servers/perfmon.py @@ -4,8 +4,10 @@ set ob = CreateObject("Python.PerfmonQuery") freeBytes = ob.Query("Memory", "Available Bytes") """ +import pythoncom +import win32pdhutil +import winerror from win32com.server import exception, register -import pythoncom, win32pdhutil, winerror class PerfMonQuery: diff --git a/com/win32com/servers/test_pycomtest.py b/com/win32com/servers/test_pycomtest.py index 3fb08569ca..da606efa84 100644 --- a/com/win32com/servers/test_pycomtest.py +++ b/com/win32com/servers/test_pycomtest.py @@ -2,16 +2,15 @@ # The object is registered when you first run the test suite. # (and hopefully unregistered once done ;-) +import pythoncom +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.client import gencache -import winerror -from win32com.client import constants from win32com.server.util import wrap -import pythoncom - pythoncom.__future_currency__ = True # We use the constants from the module, so must insist on a gencache. # Otherwise, use of gencache is not necessary (tho still advised) diff --git a/com/win32com/test/GenTestScripts.py b/com/win32com/test/GenTestScripts.py index 61a81c1b77..73bb26411c 100644 --- a/com/win32com/test/GenTestScripts.py +++ b/com/win32com/test/GenTestScripts.py @@ -1,10 +1,13 @@ # # Generate scripts needed for serious testing! # -import win32com, win32com.client.makepy -import win32com.test +import os +import sys + import pythoncom -import sys, os +import win32com +import win32com.client.makepy +import win32com.test genList = [ ("msword8", "{00020905-0000-0000-C000-000000000046}", 1033, 8, 0), diff --git a/com/win32com/test/errorSemantics.py b/com/win32com/test/errorSemantics.py index a4cf64fd3c..49ebae2f1c 100644 --- a/com/win32com/test/errorSemantics.py +++ b/com/win32com/test/errorSemantics.py @@ -12,10 +12,10 @@ # * "Normal" Python exceptions resolve to an E_FAIL "internal error" import pythoncom +import winerror +from win32com.client import Dispatch from win32com.server.exception import COMException from win32com.server.util import wrap -from win32com.client import Dispatch -import winerror from win32com.test.util import CaptureWriter diff --git a/com/win32com/test/pippo_server.py b/com/win32com/test/pippo_server.py index f19e7733a9..edcd91685e 100644 --- a/com/win32com/test/pippo_server.py +++ b/com/win32com/test/pippo_server.py @@ -2,7 +2,9 @@ # Originally submitted with bug: # [ 753154 ] memory leak wrapping object having _typelib_guid_ attribute # but modified by mhammond for use as part of the test suite. -import sys, os +import os +import sys + import pythoncom import win32com import winerror diff --git a/com/win32com/test/policySemantics.py b/com/win32com/test/policySemantics.py index f638e93195..746522f727 100644 --- a/com/win32com/test/policySemantics.py +++ b/com/win32com/test/policySemantics.py @@ -1,10 +1,10 @@ -import win32com.server.util -import win32com.client +import unittest + import pythoncom -import winerror +import win32com.client +import win32com.server.util import win32com.test.util - -import unittest +import winerror class Error(Exception): diff --git a/com/win32com/test/testADOEvents.py b/com/win32com/test/testADOEvents.py index 7fa98dfbf3..c79b2f7e88 100644 --- a/com/win32com/test/testADOEvents.py +++ b/com/win32com/test/testADOEvents.py @@ -1,8 +1,9 @@ -from win32com.client import Dispatch, DispatchWithEvents, constants -import pythoncom import os import time +import pythoncom +from win32com.client import Dispatch, DispatchWithEvents, constants + finished = 0 # Flag for the wait loop from (3) to test diff --git a/com/win32com/test/testAXScript.py b/com/win32com/test/testAXScript.py index 74dfd25dde..c37a5aff74 100644 --- a/com/win32com/test/testAXScript.py +++ b/com/win32com/test/testAXScript.py @@ -1,10 +1,10 @@ # Test AXScripting the best we can in an automated fashion... -import win32api, os, sys +import os +import sys +import win32api import win32com.axscript import win32com.axscript.client - -import unittest import win32com.test.util verbose = "-v" in sys.argv diff --git a/com/win32com/test/testAccess.py b/com/win32com/test/testAccess.py index f834891474..e6fce872ab 100644 --- a/com/win32com/test/testAccess.py +++ b/com/win32com/test/testAccess.py @@ -7,10 +7,12 @@ # You can run this with no args, and a test database will be generated. # You can optionally pass a dbname on the command line, in which case it will be dumped. +import os +import sys + import pythoncom -from win32com.client import gencache, constants, Dispatch import win32api -import os, sys +from win32com.client import Dispatch, constants, gencache def CreateTestAccessDatabase(dbname=None): @@ -173,6 +175,7 @@ def test(dbname=None): if __name__ == "__main__": import sys + from .util import CheckClean dbname = None diff --git a/com/win32com/test/testArrays.py b/com/win32com/test/testArrays.py index 1a3c63c549..f395a4131a 100644 --- a/com/win32com/test/testArrays.py +++ b/com/win32com/test/testArrays.py @@ -1,8 +1,8 @@ # Originally contributed by Stefan Schukat as part of this arbitrary-sized # arrays patch. + from win32com.client import gencache from win32com.test import util -import unittest ZeroD = 0 OneDEmpty = [] diff --git a/com/win32com/test/testClipboard.py b/com/win32com/test/testClipboard.py index d47ac7f209..60df8668b8 100644 --- a/com/win32com/test/testClipboard.py +++ b/com/win32com/test/testClipboard.py @@ -1,12 +1,12 @@ # testClipboard.py import unittest + import pythoncom +import win32clipboard import win32con import winerror -import win32clipboard - -from win32com.server.util import NewEnum, wrap from win32com.server.exception import COMException +from win32com.server.util import NewEnum, wrap IDataObject_Methods = """GetData GetDataHere QueryGetData GetCanonicalFormatEtc SetData EnumFormatEtc diff --git a/com/win32com/test/testCollections.py b/com/win32com/test/testCollections.py index 9feb47e059..954697e086 100644 --- a/com/win32com/test/testCollections.py +++ b/com/win32com/test/testCollections.py @@ -5,12 +5,12 @@ # # Also has the side effect of testing some of the PythonCOM error semantics. import sys -import win32com.server.util -import win32com.test.util -import win32com.client -import traceback + import pythoncom import pywintypes +import win32com.client +import win32com.server.util +import win32com.test.util import winerror L = pywintypes.Unicode diff --git a/com/win32com/test/testConversionErrors.py b/com/win32com/test/testConversionErrors.py index be954dac0c..a4b755e688 100644 --- a/com/win32com/test/testConversionErrors.py +++ b/com/win32com/test/testConversionErrors.py @@ -1,8 +1,8 @@ import unittest import win32com.client -import win32com.test.util import win32com.server.util +import win32com.test.util class Tester: diff --git a/com/win32com/test/testDCOM.py b/com/win32com/test/testDCOM.py index 94f574d517..9f5a334e14 100644 --- a/com/win32com/test/testDCOM.py +++ b/com/win32com/test/testDCOM.py @@ -12,9 +12,14 @@ The Python.Interpreter object must be installed on the local machine, but no special DCOM configuration should be necessary. """ +import string +import sys + # NOTE: If you configured the object locally using dcomcnfg, you could # simple use Dispatch rather than DispatchEx. -import pythoncom, win32com.client, win32api, string, sys +import pythoncom +import win32api +import win32com.client def test(serverName): diff --git a/com/win32com/test/testDates.py b/com/win32com/test/testDates.py index 092d6c405a..00406ddaec 100644 --- a/com/win32com/test/testDates.py +++ b/com/win32com/test/testDates.py @@ -1,10 +1,10 @@ -from datetime import datetime import unittest +from datetime import datetime import pywintypes import win32com.client -import win32com.test.util import win32com.server.util +import win32com.test.util from win32timezone import TimeZoneInfo diff --git a/com/win32com/test/testDictionary.py b/com/win32com/test/testDictionary.py index dcfe3128ff..869cc1862f 100644 --- a/com/win32com/test/testDictionary.py +++ b/com/win32com/test/testDictionary.py @@ -1,18 +1,15 @@ # testDictionary.py # import sys -import datetime -import time -import win32com.server.util -import win32com.test.util -import win32com.client -import traceback +import unittest + import pythoncom import pywintypes -import winerror +import win32com.client +import win32com.server.util +import win32com.test.util import win32timezone - -import unittest +import winerror def MakeTestDictionary(): diff --git a/com/win32com/test/testDynamic.py b/com/win32com/test/testDynamic.py index 3020c0f6aa..2fd9197249 100644 --- a/com/win32com/test/testDynamic.py +++ b/com/win32com/test/testDynamic.py @@ -2,7 +2,6 @@ import pythoncom import winerror - from win32com.server.exception import Exception error = "testDynamic error" @@ -45,7 +44,8 @@ def write(self, *args): def Test(): - import win32com.server.util, win32com.server.policy + import win32com.server.policy + import win32com.server.util # import win32dbg;win32dbg.brk() ob = win32com.server.util.wrap( diff --git a/com/win32com/test/testExchange.py b/com/win32com/test/testExchange.py index 4d48974f55..b41a44726a 100644 --- a/com/win32com/test/testExchange.py +++ b/com/win32com/test/testExchange.py @@ -3,15 +3,17 @@ # You should use the Outlook object model, or # the win32com.mapi examples for a low-level interface. -from win32com.client import gencache, constants -import pythoncom import os +import pythoncom +from win32com.client import constants, gencache + ammodule = None # was the generated module! def GetDefaultProfileName(): - import win32api, win32con + import win32api + import win32con try: key = win32api.RegOpenKey( diff --git a/com/win32com/test/testExplorer.py b/com/win32com/test/testExplorer.py index e81550b79e..bca663582f 100644 --- a/com/win32com/test/testExplorer.py +++ b/com/win32com/test/testExplorer.py @@ -1,16 +1,15 @@ # testExplorer - -import sys import os -import win32com.client.dynamic -from win32com.client import Dispatch +import time + +import pythoncom import win32api -import win32gui +import win32com.client.dynamic import win32con +import win32gui import winerror -import glob -import pythoncom -import time +from win32com.client import Dispatch from win32com.test.util import CheckClean bVisibleEventFired = 0 diff --git a/com/win32com/test/testGIT.py b/com/win32com/test/testGIT.py index 7283c879ca..2ec6bc44b9 100644 --- a/com/win32com/test/testGIT.py +++ b/com/win32com/test/testGIT.py @@ -21,10 +21,13 @@ """ -import _thread, traceback -import win32com.client -import win32event, win32api +import _thread +import traceback + import pythoncom +import win32api +import win32com.client +import win32event def TestInterp(interp): diff --git a/com/win32com/test/testGatewayAddresses.py b/com/win32com/test/testGatewayAddresses.py index abca20b85f..d489916992 100644 --- a/com/win32com/test/testGatewayAddresses.py +++ b/com/win32com/test/testGatewayAddresses.py @@ -34,8 +34,9 @@ # The rest are tested here. -from win32com.server.util import wrap import pythoncom +from win32com.server.util import wrap + from .util import CheckClean numErrors = 0 diff --git a/com/win32com/test/testIterators.py b/com/win32com/test/testIterators.py index 78ac279f85..b75a78dfcd 100644 --- a/com/win32com/test/testIterators.py +++ b/com/win32com/test/testIterators.py @@ -3,11 +3,11 @@ import sys import unittest -from win32com.client.gencache import EnsureDispatch -from win32com.client import Dispatch +import pythoncom import win32com.server.util import win32com.test.util -import pythoncom +from win32com.client import Dispatch +from win32com.client.gencache import EnsureDispatch class _BaseTestCase(win32com.test.util.TestCase): diff --git a/com/win32com/test/testMSOffice.py b/com/win32com/test/testMSOffice.py index 09405b7ea2..f4893dfde8 100644 --- a/com/win32com/test/testMSOffice.py +++ b/com/win32com/test/testMSOffice.py @@ -5,12 +5,15 @@ # Assumes Word and Excel installed on your machine. -import win32com, sys, string, win32api, traceback -import win32com.client.dynamic -from win32com.test.util import CheckClean +import traceback + import pythoncom -from win32com.client import gencache +import win32api +import win32com +import win32com.client.dynamic from pywintypes import Unicode +from win32com.client import gencache +from win32com.test.util import CheckClean error = "MSOffice test error" diff --git a/com/win32com/test/testMSOfficeEvents.py b/com/win32com/test/testMSOfficeEvents.py index d36576606a..c173c3ef1d 100644 --- a/com/win32com/test/testMSOfficeEvents.py +++ b/com/win32com/test/testMSOfficeEvents.py @@ -1,10 +1,12 @@ # OfficeEvents - test/demonstrate events with Word and Excel. -from win32com.client import DispatchWithEvents, Dispatch -import msvcrt, pythoncom -import time, sys +import msvcrt +import sys +import threading +import time import types -import threading +import pythoncom +from win32com.client import Dispatch, DispatchWithEvents stopEvent = threading.Event() diff --git a/com/win32com/test/testMarshal.py b/com/win32com/test/testMarshal.py index 152777f669..c57d445f87 100644 --- a/com/win32com/test/testMarshal.py +++ b/com/win32com/test/testMarshal.py @@ -21,12 +21,14 @@ """ -import threading, traceback -import win32com.client -import win32event, win32api -import pythoncom +import threading import unittest +import pythoncom +import win32api +import win32com.client +import win32event + from .testServers import InterpCase freeThreaded = 1 diff --git a/com/win32com/test/testNetscape.py b/com/win32com/test/testNetscape.py index 04f0c1e188..471de80288 100644 --- a/com/win32com/test/testNetscape.py +++ b/com/win32com/test/testNetscape.py @@ -2,9 +2,10 @@ # But this is the general idea. -import netscape import sys +import netscape + error = "Netscape Test Error" if __name__ == "__main__": diff --git a/com/win32com/test/testPersist.py b/com/win32com/test/testPersist.py index 10fae96f16..066f402921 100644 --- a/com/win32com/test/testPersist.py +++ b/com/win32com/test/testPersist.py @@ -1,25 +1,22 @@ -import pythoncom -import win32com.server.util -import time +import os -import win32com, sys, string, win32api, traceback -import win32com.client.dynamic -import win32com.client import pythoncom -from win32com.axcontrol import axcontrol -from pywintypes import Unicode -from win32com import storagecon -from win32com.test.util import CheckClean - import pywintypes +import win32api +import win32com +import win32com.client +import win32com.client.dynamic +import win32com.server.util import win32ui -import win32api, os - from pywin32_testutil import str2bytes +from pywintypes import Unicode +from win32com import storagecon +from win32com.axcontrol import axcontrol +from win32com.test.util import CheckClean S_OK = 0 -import datetime + import win32timezone now = win32timezone.now() @@ -78,11 +75,9 @@ def SetSize(self, size): def LockRegion(self, offset, size, locktype): print("LockRegion") - pass def UnlockRegion(self, offset, size, locktype): print("UnlockRegion") - pass def Stat(self, statflag): print("returning Stat " + str(statflag)) diff --git a/com/win32com/test/testPippo.py b/com/win32com/test/testPippo.py index d2d38b1bdc..a1a762c2c8 100644 --- a/com/win32com/test/testPippo.py +++ b/com/win32com/test/testPippo.py @@ -1,5 +1,6 @@ import sys import unittest + import pythoncom from win32com.client import Dispatch from win32com.client.gencache import EnsureDispatch @@ -7,8 +8,8 @@ class PippoTester(unittest.TestCase): def setUp(self): - from win32com.test.util import RegisterPythonServer from win32com.test import pippo_server + from win32com.test.util import RegisterPythonServer RegisterPythonServer(pippo_server.__file__, "Python.Test.Pippo") # create it. diff --git a/com/win32com/test/testPyComTest.py b/com/win32com/test/testPyComTest.py index 9350b03972..aec0a6f584 100644 --- a/com/win32com/test/testPyComTest.py +++ b/com/win32com/test/testPyComTest.py @@ -4,19 +4,21 @@ import sys sys.coinit_flags = 0 # Must be free-threaded! -import win32api, pythoncom, time -import pywintypes +import datetime +import decimal import os -import winerror +import time + +import pythoncom +import pywintypes +import win32api import win32com import win32com.client.connect -from win32com.test.util import CheckClean -from win32com.client import constants, DispatchBaseClass, CastTo, VARIANT -from win32com.test.util import RegisterPythonServer -from pywin32_testutil import str2memory -import datetime -import decimal import win32timezone +import winerror +from pywin32_testutil import str2memory +from win32com.client import VARIANT, CastTo, DispatchBaseClass, constants +from win32com.test.util import CheckClean, 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++" diff --git a/com/win32com/test/testROT.py b/com/win32com/test/testROT.py index 1edf06e64c..5a4ccbcc8c 100644 --- a/com/win32com/test/testROT.py +++ b/com/win32com/test/testROT.py @@ -1,5 +1,6 @@ -import pythoncom import unittest + +import pythoncom import win32com.test.util import winerror diff --git a/com/win32com/test/testServers.py b/com/win32com/test/testServers.py index f8614a7ce0..f25009bfcf 100644 --- a/com/win32com/test/testServers.py +++ b/com/win32com/test/testServers.py @@ -1,8 +1,10 @@ -import pythoncom, win32com.client.dynamic, sys -import winerror -import win32com.test.util import unittest +import pythoncom +import win32com.client.dynamic +import win32com.test.util +import winerror + def TestConnections(): import win32com.demos.connect @@ -13,8 +15,8 @@ def TestConnections(): class InterpCase(win32com.test.util.TestCase): def setUp(self): # Ensure the correct version registered. - from win32com.test.util import RegisterPythonServer from win32com.servers import interp + from win32com.test.util import RegisterPythonServer RegisterPythonServer(interp.__file__, "Python.Interpreter") diff --git a/com/win32com/test/testShell.py b/com/win32com/test/testShell.py index 8874597eb5..b312a9dc0f 100644 --- a/com/win32com/test/testShell.py +++ b/com/win32com/test/testShell.py @@ -1,8 +1,8 @@ -import sys, os -import struct -import unittest -import copy import datetime +import os +import struct +import sys + import win32timezone try: @@ -10,16 +10,15 @@ except AttributeError: sys_maxsize = sys.maxint -import win32con import pythoncom import pywintypes +import win32com.test.util +import win32con +from pywin32_testutil import str2bytes from win32com.shell import shell from win32com.shell.shellcon import * from win32com.storagecon import * -import win32com.test.util -from pywin32_testutil import str2bytes - class ShellTester(win32com.test.util.TestCase): def testShellLink(self): diff --git a/com/win32com/test/testStorage.py b/com/win32com/test/testStorage.py index be796e7cbe..5b7e25de93 100644 --- a/com/win32com/test/testStorage.py +++ b/com/win32com/test/testStorage.py @@ -1,9 +1,10 @@ -from win32com import storagecon -import pythoncom, os, win32api -import win32com.test.util - import unittest +import pythoncom +import win32api +import win32com.test.util +from win32com import storagecon + class TestEnum(win32com.test.util.TestCase): def testit(self): diff --git a/com/win32com/test/testStreams.py b/com/win32com/test/testStreams.py index 6d3201db45..3beb47c760 100644 --- a/com/win32com/test/testStreams.py +++ b/com/win32com/test/testStreams.py @@ -1,8 +1,8 @@ +import unittest + import pythoncom import win32com.server.util import win32com.test.util - -import unittest from pywin32_testutil import str2bytes diff --git a/com/win32com/test/testWMI.py b/com/win32com/test/testWMI.py index e91c4bad3f..5829b48e4b 100644 --- a/com/win32com/test/testWMI.py +++ b/com/win32com/test/testWMI.py @@ -1,8 +1,8 @@ -from win32com.client import GetObject -import win32com.test.util - import unittest +import win32com.test.util +from win32com.client import GetObject + class Simple(win32com.test.util.TestCase): def testit(self): diff --git a/com/win32com/test/testall.py b/com/win32com/test/testall.py index d06a328b84..6da07407a3 100644 --- a/com/win32com/test/testall.py +++ b/com/win32com/test/testall.py @@ -1,5 +1,9 @@ -import sys, os, string, re -import getopt, traceback, unittest +import getopt +import os +import re +import sys +import traceback +import unittest try: this_file = __file__ @@ -20,13 +24,13 @@ import pythoncom import win32com.client from win32com.test.util import ( - CheckClean, - TestCase, CapturingFunctionTestCase, + CheckClean, + RegisterPythonServer, ShellTestCase, + TestCase, TestLoader, TestRunner, - RegisterPythonServer, ) verbosity = 1 # default unittest verbosity. @@ -43,7 +47,9 @@ def GenerateAndRunOldStyle(): def CleanGenerated(): - import win32com, shutil + import shutil + + import win32com if os.path.isdir(win32com.__gen_path__): if verbosity > 1: diff --git a/com/win32com/test/testmakepy.py b/com/win32com/test/testmakepy.py index 36f7c6e87c..2eeb881871 100644 --- a/com/win32com/test/testmakepy.py +++ b/com/win32com/test/testmakepy.py @@ -1,16 +1,13 @@ # Test makepy - try and run it over every OCX in the windows system directory. import sys -import win32api -import traceback -import glob -import os import traceback -import win32com.test.util -from win32com.client import makepy, selecttlb, gencache import pythoncom +import win32api +import win32com.test.util import winerror +from win32com.client import gencache, makepy, selecttlb def TestBuildAll(verbose=1): diff --git a/com/win32com/test/testvb.py b/com/win32com/test/testvb.py index 1edae03cdb..5a3d2f73d4 100644 --- a/com/win32com/test/testvb.py +++ b/com/win32com/test/testvb.py @@ -4,13 +4,16 @@ # import sys +import traceback + +import pythoncom +import win32com.client +import win32com.client.dynamic +import win32com.client.gencache import winerror -import pythoncom, win32com.client, win32com.client.dynamic, win32com.client.gencache +from pywin32_testutil import str2memory from win32com.server.util import NewCollection, wrap from win32com.test import util -from pywin32_testutil import str2memory - -import traceback # for debugging useDispatcher = None diff --git a/com/win32com/test/testvbscript_regexp.py b/com/win32com/test/testvbscript_regexp.py index 2b06f2f472..a22f0bea52 100644 --- a/com/win32com/test/testvbscript_regexp.py +++ b/com/win32com/test/testvbscript_regexp.py @@ -1,7 +1,8 @@ import unittest -from win32com.client.gencache import EnsureDispatch -from win32com.client.dynamic import DumbDispatch + import win32com.test.util +from win32com.client.dynamic import DumbDispatch +from win32com.client.gencache import EnsureDispatch class RegexTest(win32com.test.util.TestCase): diff --git a/com/win32com/test/testxslt.py b/com/win32com/test/testxslt.py index 540f8ab1a9..caaa2ec51f 100644 --- a/com/win32com/test/testxslt.py +++ b/com/win32com/test/testxslt.py @@ -1,6 +1,7 @@ import os import tempfile import unittest + import win32com.test.util expected_output = "The jscript test worked.\nThe Python test worked" diff --git a/com/win32com/test/util.py b/com/win32com/test/util.py index f11fc5ba38..691be85190 100644 --- a/com/win32com/test/util.py +++ b/com/win32com/test/util.py @@ -1,19 +1,19 @@ -import sys, os -import win32api -import tempfile -import unittest import gc -import pywintypes -import pythoncom -import winerror -from pythoncom import _GetInterfaceCount, _GetGatewayCount -import win32com import logging +import os +import sys +import tempfile +import unittest import winreg -import io as StringIO +import pythoncom import pywin32_testutil -from pywin32_testutil import TestLoader, TestResult, TestRunner, LeakTestCase +import pywintypes +import win32api +import win32com +import winerror +from pythoncom import _GetGatewayCount, _GetInterfaceCount +from pywin32_testutil import LeakTestCase, TestLoader, TestResult, TestRunner def CheckClean(): diff --git a/com/win32com/universal.py b/com/win32com/universal.py index 2389cd951a..7c2944ed10 100644 --- a/com/win32com/universal.py +++ b/com/win32com/universal.py @@ -1,7 +1,7 @@ # Code that packs and unpacks the Univgw structures. # See if we have a special directory for the binaries (for developers) -import types + import pythoncom from win32com.client import gencache diff --git a/com/win32com/util.py b/com/win32com/util.py index ce57ca2bee..767e34a7cb 100644 --- a/com/win32com/util.py +++ b/com/win32com/util.py @@ -3,7 +3,8 @@ This module contains a collection of general purpose utility functions. """ import pythoncom -import win32api, win32con +import win32api +import win32con def IIDToInterfaceName(iid): diff --git a/com/win32comext/adsi/__init__.py b/com/win32comext/adsi/__init__.py index 2af0decaca..ab95196f68 100644 --- a/com/win32comext/adsi/__init__.py +++ b/com/win32comext/adsi/__init__.py @@ -24,6 +24,7 @@ # derive from IDispatch - thus, you get the custome methods from the # interface, as well as via IDispatch. import pythoncom + from .adsi import * LCID = 0 diff --git a/com/win32comext/adsi/demos/objectPicker.py b/com/win32comext/adsi/demos/objectPicker.py index 86f58402c5..5df4245997 100644 --- a/com/win32comext/adsi/demos/objectPicker.py +++ b/com/win32comext/adsi/demos/objectPicker.py @@ -1,6 +1,6 @@ # A demo for the IDsObjectPicker interface. -import win32clipboard import pythoncom +import win32clipboard from win32com.adsi import adsi from win32com.adsi.adsicon import * diff --git a/com/win32comext/adsi/demos/scp.py b/com/win32comext/adsi/demos/scp.py index 1c7d4668b5..d1a4ca05ec 100644 --- a/com/win32comext/adsi/demos/scp.py +++ b/com/win32comext/adsi/demos/scp.py @@ -34,14 +34,18 @@ Executing with --test will create and remove one of everything. """ -from win32com.adsi.adsicon import * -from win32com.adsi import adsi -import win32api, win32con, winerror -from win32com.client import Dispatch +import optparse +import textwrap +import traceback + import ntsecuritycon as dscon +import win32api +import win32con import win32security -import optparse, textwrap -import traceback +import winerror +from win32com.adsi import adsi +from win32com.adsi.adsicon import * +from win32com.client import Dispatch verbose = 1 g_createdSCP = None diff --git a/com/win32comext/adsi/demos/search.py b/com/win32comext/adsi/demos/search.py index 3015c2fc66..22c6a25811 100644 --- a/com/win32comext/adsi/demos/search.py +++ b/com/win32comext/adsi/demos/search.py @@ -1,7 +1,8 @@ -from win32com.adsi import adsi +import pythoncom +import pywintypes +import win32security +from win32com.adsi import adsi, adsicon from win32com.adsi.adsicon import * -from win32com.adsi import adsicon -import pythoncom, pywintypes, win32security options = None # set to optparse options object diff --git a/com/win32comext/adsi/demos/test.py b/com/win32comext/adsi/demos/test.py index e514700cf7..a1dba34dc5 100644 --- a/com/win32comext/adsi/demos/test.py +++ b/com/win32comext/adsi/demos/test.py @@ -1,6 +1,7 @@ -import sys, string -import pythoncom +import string +import sys +import pythoncom import win32api from win32com.adsi import * @@ -225,7 +226,8 @@ def usage(tests): def main(): - import getopt, traceback + import getopt + import traceback tests = [] for ob in globals().values(): diff --git a/com/win32comext/authorization/demos/EditSecurity.py b/com/win32comext/authorization/demos/EditSecurity.py index 19c38d434f..d961bc0d18 100644 --- a/com/win32comext/authorization/demos/EditSecurity.py +++ b/com/win32comext/authorization/demos/EditSecurity.py @@ -1,54 +1,57 @@ import os -import win32com.server.policy -import win32security, ntsecuritycon, win32con -import pythoncom, win32api -from win32com.authorization import authorization +import ntsecuritycon +import pythoncom +import win32api +import win32com.server.policy +import win32con +import win32security from ntsecuritycon import ( + CONTAINER_INHERIT_ACE, + FILE_ALL_ACCESS, + FILE_APPEND_DATA, + FILE_GENERIC_EXECUTE, + FILE_GENERIC_READ, + FILE_GENERIC_WRITE, FILE_READ_ATTRIBUTES, FILE_READ_DATA, FILE_READ_EA, - SYNCHRONIZE, - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE, - FILE_APPEND_DATA, FILE_WRITE_ATTRIBUTES, FILE_WRITE_DATA, FILE_WRITE_EA, - WRITE_OWNER, - WRITE_DAC, + INHERIT_ONLY_ACE, + OBJECT_INHERIT_ACE, + 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_EDIT_ALL, - SI_PAGE_TITLE, - SI_RESET, - SI_ACCESS_SPECIFIC, - SI_ACCESS_GENERAL, - SI_ACCESS_CONTAINER, - SI_ACCESS_PROPERTY, - FILE_ALL_ACCESS, - FILE_GENERIC_READ, - FILE_GENERIC_WRITE, - FILE_GENERIC_EXECUTE, - OBJECT_INHERIT_ACE, - CONTAINER_INHERIT_ACE, - INHERIT_ONLY_ACE, - SI_PAGE_PERM, SI_PAGE_ADVPERM, SI_PAGE_AUDIT, SI_PAGE_OWNER, - PSPCB_SI_INITDIALOG, - SI_CONTAINER, + SI_PAGE_PERM, + SI_PAGE_TITLE, + SI_RESET, + STANDARD_RIGHTS_EXECUTE, + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + SYNCHRONIZE, + WRITE_DAC, + WRITE_OWNER, ) -from win32security import OBJECT_INHERIT_ACE, CONTAINER_INHERIT_ACE, INHERIT_ONLY_ACE -from win32com.shell.shellcon import ( - PSPCB_RELEASE, - PSPCB_CREATE, -) ## Msg parameter to PropertySheetPageCallback 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 class SecurityInformation(win32com.server.policy.DesignatedWrapPolicy): diff --git a/com/win32comext/authorization/demos/EditServiceSecurity.py b/com/win32comext/authorization/demos/EditServiceSecurity.py index 9057c4722f..86d60414c1 100644 --- a/com/win32comext/authorization/demos/EditServiceSecurity.py +++ b/com/win32comext/authorization/demos/EditServiceSecurity.py @@ -5,9 +5,14 @@ """ import os + +import ntsecuritycon +import pythoncom +import win32api import win32com.server.policy -import win32security, ntsecuritycon, win32con -import pythoncom, win32api, win32service +import win32con +import win32security +import win32service from win32com.authorization import authorization SERVICE_GENERIC_EXECUTE = ( @@ -25,38 +30,38 @@ SERVICE_GENERIC_WRITE = win32service.SERVICE_CHANGE_CONFIG from ntsecuritycon import ( - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE, - WRITE_OWNER, - WRITE_DAC, + CONTAINER_INHERIT_ACE, + INHERIT_ONLY_ACE, + OBJECT_INHERIT_ACE, + 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_EDIT_ALL, - SI_PAGE_TITLE, - SI_RESET, - SI_ACCESS_SPECIFIC, - SI_ACCESS_GENERAL, - SI_ACCESS_CONTAINER, - SI_ACCESS_PROPERTY, - OBJECT_INHERIT_ACE, - CONTAINER_INHERIT_ACE, - INHERIT_ONLY_ACE, - SI_PAGE_PERM, SI_PAGE_ADVPERM, SI_PAGE_AUDIT, SI_PAGE_OWNER, - PSPCB_SI_INITDIALOG, - SI_CONTAINER, + SI_PAGE_PERM, + SI_PAGE_TITLE, + SI_RESET, + STANDARD_RIGHTS_EXECUTE, + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + WRITE_DAC, + WRITE_OWNER, ) -from win32security import OBJECT_INHERIT_ACE, CONTAINER_INHERIT_ACE, INHERIT_ONLY_ACE -from win32com.shell.shellcon import ( - PSPCB_RELEASE, - PSPCB_CREATE, -) ## Msg parameter to PropertySheetPageCallback from pythoncom import IID_NULL +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 class ServiceSecurity(win32com.server.policy.DesignatedWrapPolicy): diff --git a/com/win32comext/axcontrol/demos/container_ie.py b/com/win32comext/axcontrol/demos/container_ie.py index 8adee201ae..135420b458 100644 --- a/com/win32comext/axcontrol/demos/container_ie.py +++ b/com/win32comext/axcontrol/demos/container_ie.py @@ -2,16 +2,16 @@ # A nod to the Code Project's article "Embed an HTML control in your own # window using plain C" import sys -from win32com.axcontrol import axcontrol -from win32com.server.exception import COMException -from win32com.server.util import wrap -from win32com.client import Dispatch import pythoncom +import win32api import win32con import win32gui import winerror -import win32api +from win32com.axcontrol import axcontrol +from win32com.client import Dispatch +from win32com.server.exception import COMException +from win32com.server.util import wrap # Set to True to see debug output in the 'trace collector' window. debugging = False diff --git a/com/win32comext/axdebug/Test/host.py b/com/win32comext/axdebug/Test/host.py index c11891b870..021e8ace7e 100644 --- a/com/win32comext/axdebug/Test/host.py +++ b/com/win32comext/axdebug/Test/host.py @@ -1,15 +1,15 @@ -import sys, traceback, string +import os +import traceback + +import pythoncom +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.server.exception import Exception -from win32com.axscript import axscript -from win32com.axdebug import axdebug, gateways, documents, contexts, adb -from win32com.axdebug.util import trace, _wrap, _wrap_remove -from win32com.axdebug import codecontainer - -import pythoncom -import win32api, winerror -import os class ExternalConnection: @@ -157,8 +157,8 @@ def testdumb(): def TestSmartProvider(): - from win32com.axdebug import debugger import ttest + from win32com.axdebug import debugger d = debugger.AXDebugger() # d.StartDebugger() diff --git a/com/win32comext/axdebug/adb.py b/com/win32comext/axdebug/adb.py index 308ec76138..812c23e62a 100644 --- a/com/win32comext/axdebug/adb.py +++ b/com/win32comext/axdebug/adb.py @@ -1,12 +1,18 @@ """The glue between the Python debugger interface and the Active Debugger interface """ -from win32com.axdebug.util import trace, _wrap, _wrap_remove -from win32com.server.util import unwrap +import _thread +import bdb +import os +import sys +import traceback + +import pythoncom +import win32api import win32com.client.connect -from . import gateways, axdebug, stackframe -import sys, bdb, traceback -import win32api, pythoncom -import _thread, os +from win32com.axdebug.util import _wrap, _wrap_remove, trace +from win32com.server.util import unwrap + +from . import axdebug, gateways, stackframe def fnull(*args): diff --git a/com/win32comext/axdebug/codecontainer.py b/com/win32comext/axdebug/codecontainer.py index 79a340d85a..a7a2e24566 100644 --- a/com/win32comext/axdebug/codecontainer.py +++ b/com/win32comext/axdebug/codecontainer.py @@ -5,13 +5,15 @@ """ import sys -from win32com.axdebug import axdebug import tokenize -from .util import RaiseNotImpl, _wrap +import win32api +import winerror +from win32com.axdebug import axdebug from win32com.server.exception import Exception -import win32api, winerror + from . import contexts +from .util import RaiseNotImpl, _wrap _keywords = {} # set of Python keywords for name in """ diff --git a/com/win32comext/axdebug/contexts.py b/com/win32comext/axdebug/contexts.py index 2f6f990710..8581663943 100644 --- a/com/win32comext/axdebug/contexts.py +++ b/com/win32comext/axdebug/contexts.py @@ -1,11 +1,13 @@ """ A module for managing the AXDebug I*Contexts """ -import pythoncom, win32com.server.util +import pythoncom +import win32com.server.util + +from . import adb, axdebug, gateways # Utility function for wrapping object created by this module. from .util import _wrap, _wrap_remove, trace -from . import adb, gateways, axdebug class DebugCodeContext(gateways.DebugCodeContext, gateways.DebugDocumentContext): diff --git a/com/win32comext/axdebug/debugger.py b/com/win32comext/axdebug/debugger.py index 158c48d8c5..3157586bce 100644 --- a/com/win32comext/axdebug/debugger.py +++ b/com/win32comext/axdebug/debugger.py @@ -1,20 +1,20 @@ -import sys, traceback, string +import os +import string +import sys -from win32com.axscript import axscript +import pythoncom +import win32api from win32com.axdebug import ( - codecontainer, + adb, axdebug, - gateways, - documents, + codecontainer, contexts, - adb, + documents, expressions, + gateways, ) -from win32com.axdebug.util import trace, _wrap, _wrap_remove - -import pythoncom -import win32api, winerror -import os +from win32com.axdebug.util import _wrap, _wrap_remove, trace +from win32com.axscript import axscript currentDebugger = None diff --git a/com/win32comext/axdebug/documents.py b/com/win32comext/axdebug/documents.py index 7ea6bc0d52..d039cf40f0 100644 --- a/com/win32comext/axdebug/documents.py +++ b/com/win32comext/axdebug/documents.py @@ -1,12 +1,14 @@ """ Management of documents for AXDebugging. """ + import pythoncom -from .util import _wrap, _wrap_remove, RaiseNotImpl, trace -from win32com.server.util import unwrap -from . import codecontainer, contexts, axdebug, gateways +import win32api from win32com.server.exception import Exception -import win32api, winerror, os, string, sys +from win32com.server.util import unwrap + +from . import axdebug, codecontainer, contexts, gateways +from .util import RaiseNotImpl, _wrap, _wrap_remove, trace # def trace(*args): # pass diff --git a/com/win32comext/axdebug/dump.py b/com/win32comext/axdebug/dump.py index 34b2fbe2c4..26ee51e0d0 100644 --- a/com/win32comext/axdebug/dump.py +++ b/com/win32comext/axdebug/dump.py @@ -1,8 +1,8 @@ -import sys, string import traceback + +import pythoncom from win32com.axdebug import axdebug from win32com.client.util import Enumerator -import pythoncom def DumpDebugApplicationNode(node, level=0): diff --git a/com/win32comext/axdebug/expressions.py b/com/win32comext/axdebug/expressions.py index 466a0a1513..28c7b90457 100644 --- a/com/win32comext/axdebug/expressions.py +++ b/com/win32comext/axdebug/expressions.py @@ -1,11 +1,14 @@ -from . import axdebug, gateways -from .util import _wrap, _wrap_remove, RaiseNotImpl -import io, traceback -from pprint import pprint -from win32com.server.exception import COMException -import winerror +import io import string import sys +import traceback +from pprint import pprint + +import winerror +from win32com.server.exception import COMException + +from . import axdebug, gateways +from .util import RaiseNotImpl, _wrap, _wrap_remove # Given an object, return a nice string diff --git a/com/win32comext/axdebug/gateways.py b/com/win32comext/axdebug/gateways.py index f0dfedffcd..d87e85b335 100644 --- a/com/win32comext/axdebug/gateways.py +++ b/com/win32comext/axdebug/gateways.py @@ -1,12 +1,12 @@ # Classes which describe interfaces. -from win32com.server.exception import Exception -from win32com.server.util import ListEnumeratorGateway -from win32com.axdebug import axdebug -from win32com.axdebug.util import RaiseNotImpl, _wrap import pythoncom import win32com.server.connect import winerror +from win32com.axdebug import axdebug +from win32com.axdebug.util import RaiseNotImpl, _wrap +from win32com.server.exception import Exception +from win32com.server.util import ListEnumeratorGateway class EnumDebugCodeContexts(ListEnumeratorGateway): diff --git a/com/win32comext/axdebug/stackframe.py b/com/win32comext/axdebug/stackframe.py index 96df62dd22..edc3fe8cb8 100644 --- a/com/win32comext/axdebug/stackframe.py +++ b/com/win32comext/axdebug/stackframe.py @@ -2,14 +2,12 @@ Provides Implements a nearly complete wrapper for a stack frame. """ -import sys -from .util import _wrap, RaiseNotImpl -from . import expressions, gateways, axdebug -import winerror + import pythoncom from win32com.server.exception import COMException -from .util import trace +from . import axdebug, expressions, gateways +from .util import RaiseNotImpl, _wrap, trace # def trace(*args): # pass diff --git a/com/win32comext/axdebug/util.py b/com/win32comext/axdebug/util.py index d866d0113b..c3d4f733f6 100644 --- a/com/win32comext/axdebug/util.py +++ b/com/win32comext/axdebug/util.py @@ -1,12 +1,13 @@ # Utility function for wrapping objects. Centralising allows me to turn # debugging on and off for the entire package in a single spot. +import os import sys + +import win32api import win32com.server.util -from win32com.server.exception import Exception import winerror -import win32api -import os +from win32com.server.exception import Exception try: os.environ["DEBUG_AXDEBUG"] diff --git a/com/win32comext/axscript/client/debug.py b/com/win32comext/axscript/client/debug.py index 338cbb8f91..2e305f0b77 100644 --- a/com/win32comext/axscript/client/debug.py +++ b/com/win32comext/axscript/client/debug.py @@ -1,17 +1,19 @@ -import traceback, sys, string +import os +import sys +import pythoncom +import win32api +import win32com.client.connect import win32com.server.util -from win32com.util import IIDToInterfaceName +import winerror +from win32com.axdebug import adb, axdebug, contexts, documents, gateways, stackframe +from win32com.axdebug.codecontainer import SourceCodeContainer +from win32com.axdebug.util import _wrap, _wrap_remove from win32com.client.util import Enumerator from win32com.server.exception import COMException -import pythoncom +from win32com.util import IIDToInterfaceName + from .framework import trace -from win32com.axdebug import axdebug, gateways, contexts, stackframe, documents, adb -from win32com.axdebug.codecontainer import SourceCodeContainer -from win32com.axdebug.util import _wrap, _wrap_remove -import win32com.client.connect -import win32api, winerror -import os try: os.environ["DEBUG_AXDEBUG"] diff --git a/com/win32comext/axscript/client/error.py b/com/win32comext/axscript/client/error.py index 7de9a3b115..1dfa54fa2f 100644 --- a/com/win32comext/axscript/client/error.py +++ b/com/win32comext/axscript/client/error.py @@ -5,13 +5,15 @@ """ -import sys, traceback -from win32com.axscript import axscript -import winerror +import re +import sys +import traceback + +import pythoncom import win32com.server.exception import win32com.server.util -import pythoncom -import re +import winerror +from win32com.axscript import axscript debugging = 0 diff --git a/com/win32comext/axscript/client/framework.py b/com/win32comext/axscript/client/framework.py index 67e952edc1..d7b56a7cbe 100644 --- a/com/win32comext/axscript/client/framework.py +++ b/com/win32comext/axscript/client/framework.py @@ -6,16 +6,15 @@ There are classes defined for the engine itself, and for ScriptItems """ +import re import sys -from win32com.axscript import axscript -import win32com.server.util -import win32com.client.connect # Need simple connection point support - -import win32api, winerror -import pythoncom -import types -import re +import pythoncom # Need simple connection point support +import win32api +import win32com.client.connect +import win32com.server.util +import winerror +from win32com.axscript import axscript def RemoveCR(text): @@ -30,6 +29,7 @@ def RemoveCR(text): SCRIPTTEXT_ISPERSISTENT = 0x00000040 from win32com.server.exception import Exception, IsCOMServerException + from . import error # ax.client.error state_map = { @@ -725,6 +725,7 @@ def SetScriptSite(self, site): try: import win32com.axdebug.axdebug # see if the core exists. + from . import debug self.debugManager = debug.DebugManager(self) @@ -1054,7 +1055,7 @@ def ChangeScriptState(self, state): self.scriptSite.OnStateChange(state) except pythoncom.com_error as xxx_todo_changeme: (hr, desc, exc, arg) = xxx_todo_changeme.args - pass # Ignore all errors here - E_NOTIMPL likely from scriptlets. + # Ignore all errors here - E_NOTIMPL likely from scriptlets. finally: self.EnableInterrupts() diff --git a/com/win32comext/axscript/client/pydumper.py b/com/win32comext/axscript/client/pydumper.py index b6a55d751b..3d0725aeff 100644 --- a/com/win32comext/axscript/client/pydumper.py +++ b/com/win32comext/axscript/client/pydumper.py @@ -13,10 +13,10 @@ # as a scripting language - meaning the dumps produced can be quite dynamic, # and based on the script code you execute. -from . import pyscript from win32com.axscript import axscript -from .pyscript import RaiseAssert, trace, Exception, SCRIPTTEXT_FORCEEXECUTION +from . import pyscript +from .pyscript import SCRIPTTEXT_FORCEEXECUTION, Exception, RaiseAssert, trace PyDump_CLSID = "{ac527e60-c693-11d0-9c25-00aa00125a98}" diff --git a/com/win32comext/axscript/client/pyscript.py b/com/win32comext/axscript/client/pyscript.py index cd8fab8c90..d2b21b58e1 100644 --- a/com/win32comext/axscript/client/pyscript.py +++ b/com/win32comext/axscript/client/pyscript.py @@ -7,25 +7,23 @@ command line. """ -import winerror -import win32com -import win32api -import pythoncom -import sys -import traceback import re + +import pythoncom +import win32api +import win32com import win32com.client.dynamic -from win32com.axscript.client import framework, scriptdispatch -from win32com.axscript import axscript import win32com.server.register - +import winerror +from win32com.axscript import axscript +from win32com.axscript.client import framework, scriptdispatch from win32com.axscript.client.framework import ( - RaiseAssert, - trace, - Exception, SCRIPTTEXT_FORCEEXECUTION, SCRIPTTEXT_ISEXPRESSION, SCRIPTTEXT_ISPERSISTENT, + Exception, + RaiseAssert, + trace, ) PyScript_CLSID = "{DF630910-1C1D-11d0-AE36-8C0F5E000000}" @@ -435,8 +433,6 @@ def DllRegisterServer(): def Register(klass=PyScript): - import sys - ret = win32com.server.register.UseCommandLine( klass, finalize_register=DllRegisterServer ) diff --git a/com/win32comext/axscript/client/pyscript_rexec.py b/com/win32comext/axscript/client/pyscript_rexec.py index a9b1821965..a07b5a1654 100644 --- a/com/win32comext/axscript/client/pyscript_rexec.py +++ b/com/win32comext/axscript/client/pyscript_rexec.py @@ -9,7 +9,7 @@ import pythoncom from win32com.axscript import axscript -import winerror + from . import pyscript INTERFACE_USES_DISPEX = 0x00000004 # Object knows to use IDispatchEx diff --git a/com/win32comext/axscript/client/scriptdispatch.py b/com/win32comext/axscript/client/scriptdispatch.py index 3e8600e242..525326e7d6 100644 --- a/com/win32comext/axscript/client/scriptdispatch.py +++ b/com/win32comext/axscript/client/scriptdispatch.py @@ -5,14 +5,15 @@ this yet, so it is not well tested! """ -import winerror import types -from win32com.server.exception import COMException + +import pythoncom import win32com.server.policy import win32com.server.util -from win32com.client import Dispatch -import pythoncom +import winerror from win32com.axscript import axscript +from win32com.client import Dispatch +from win32com.server.exception import COMException debugging = 0 diff --git a/com/win32comext/axscript/server/axsite.py b/com/win32comext/axscript/server/axsite.py index ff98923644..d07ed120d0 100644 --- a/com/win32comext/axscript/server/axsite.py +++ b/com/win32comext/axscript/server/axsite.py @@ -1,8 +1,8 @@ +import pythoncom import win32com.axscript.axscript import winerror from win32com.axscript import axscript from win32com.server import exception, util -import pythoncom class AXEngine: diff --git a/com/win32comext/axscript/test/leakTest.py b/com/win32comext/axscript/test/leakTest.py index 138d533db5..d8ccac57b6 100644 --- a/com/win32comext/axscript/test/leakTest.py +++ b/com/win32comext/axscript/test/leakTest.py @@ -1,10 +1,11 @@ import sys -from win32com.axscript.server.error import Exception -from win32com.axscript import axscript -from win32com.axscript.server import axsite + import pythoncom -from win32com.server import util, connect import win32com.server.policy +from win32com.axscript import axscript +from win32com.axscript.server import axsite +from win32com.axscript.server.error import Exception +from win32com.server import connect, util class MySite(axsite.AXSite): diff --git a/com/win32comext/axscript/test/testHost.py b/com/win32comext/axscript/test/testHost.py index bc599f14ec..8ef8bcc09a 100644 --- a/com/win32comext/axscript/test/testHost.py +++ b/com/win32comext/axscript/test/testHost.py @@ -1,16 +1,16 @@ import sys +import unittest + import pythoncom -from win32com.axscript.server.error import Exception +import win32com.server.policy +import win32com.test.util from win32com.axscript import axscript from win32com.axscript.server import axsite -from win32com.server import util, connect -import win32com.server.policy +from win32com.axscript.server.error import Exception from win32com.client.dynamic import Dispatch +from win32com.server import connect, util from win32com.server.exception import COMException -import unittest -import win32com.test.util - verbose = "-v" in sys.argv diff --git a/com/win32comext/axscript/test/testHost4Dbg.py b/com/win32comext/axscript/test/testHost4Dbg.py index 187d80b2df..3bfafd676d 100644 --- a/com/win32comext/axscript/test/testHost4Dbg.py +++ b/com/win32comext/axscript/test/testHost4Dbg.py @@ -1,10 +1,13 @@ -import os, sys, traceback +import os +import sys +import traceback + +import pythoncom +import win32ui from win32com.axscript import axscript from win32com.axscript.server import axsite from win32com.axscript.server.error import Exception -import pythoncom from win32com.server import util -import win32ui version = "0.0.1" diff --git a/com/win32comext/bits/test/show_all_jobs.py b/com/win32comext/bits/test/show_all_jobs.py index 77bf9b4716..8ce230ce0c 100644 --- a/com/win32comext/bits/test/show_all_jobs.py +++ b/com/win32comext/bits/test/show_all_jobs.py @@ -1,6 +1,6 @@ # Dump lots of info about BITS jobs. -from win32com.bits import bits import pythoncom +from win32com.bits import bits states = dict( [ diff --git a/com/win32comext/bits/test/test_bits.py b/com/win32comext/bits/test/test_bits.py index 06a3f73bfa..94bcbe4be5 100755 --- a/com/win32comext/bits/test/test_bits.py +++ b/com/win32comext/bits/test/test_bits.py @@ -1,6 +1,11 @@ -from win32com.server.util import wrap -import pythoncom, sys, os, time, win32api, win32event, tempfile +import os +import tempfile + +import pythoncom +import win32api +import win32event from win32com.bits import bits +from win32com.server.util import wrap TIMEOUT = 200 # ms StopEvent = win32event.CreateEvent(None, 0, 0, None) diff --git a/com/win32comext/directsound/test/ds_record.py b/com/win32comext/directsound/test/ds_record.py index 63ae1f61f8..13c4d645ce 100644 --- a/com/win32comext/directsound/test/ds_record.py +++ b/com/win32comext/directsound/test/ds_record.py @@ -1,8 +1,10 @@ -import pywintypes -import struct -import win32event, win32api import os +import struct + +import pywintypes +import win32api import win32com.directsound.directsound as ds +import win32event def wav_header_pack(wfx, datasize): diff --git a/com/win32comext/directsound/test/ds_test.py b/com/win32comext/directsound/test/ds_test.py index 7d59cbb7ca..84259ee2b0 100644 --- a/com/win32comext/directsound/test/ds_test.py +++ b/com/win32comext/directsound/test/ds_test.py @@ -1,13 +1,14 @@ -import unittest +import os import struct import sys -import os +import unittest + +import pythoncom import pywintypes -import win32event, win32api -import os -from pywin32_testutil import TestSkipped, find_test_fixture +import win32api import win32com.directsound.directsound as ds -import pythoncom +import win32event +from pywin32_testutil import TestSkipped, find_test_fixture # next two lines are for for debugging: # import win32com diff --git a/com/win32comext/ifilter/demo/filterDemo.py b/com/win32comext/ifilter/demo/filterDemo.py index 9022f6ed7d..30742d8a3b 100644 --- a/com/win32comext/ifilter/demo/filterDemo.py +++ b/com/win32comext/ifilter/demo/filterDemo.py @@ -1,11 +1,9 @@ import pythoncom import pywintypes - +from win32com import storagecon from win32com.ifilter import ifilter from win32com.ifilter.ifiltercon import * -from win32com import storagecon - class FileParser: # Property IDs for the Storage Property Set @@ -253,8 +251,8 @@ def _usage(): if __name__ == "__main__": - import sys import operator + import sys fName = "" verbose = False diff --git a/com/win32comext/mapi/demos/mapisend.py b/com/win32comext/mapi/demos/mapisend.py index 578c06b3d6..9f94361a32 100644 --- a/com/win32comext/mapi/demos/mapisend.py +++ b/com/win32comext/mapi/demos/mapisend.py @@ -6,8 +6,7 @@ # written by David Fraser and Stephen Emslie # you can test this by changing the variables at the bottom and running from the command line -from win32com.mapi import mapi -from win32com.mapi import mapitags +from win32com.mapi import mapi, mapitags def SendEMAPIMail( diff --git a/com/win32comext/mapi/emsabtags.py b/com/win32comext/mapi/emsabtags.py index 71046878a8..65e93df172 100644 --- a/com/win32comext/mapi/emsabtags.py +++ b/com/win32comext/mapi/emsabtags.py @@ -1,50 +1,48 @@ # Converted "manually" from EMSABTAG.H from .mapitags import ( - PT_UNSPECIFIED, - PT_NULL, - PT_I2, - PT_LONG, - PT_R4, - PT_DOUBLE, - PT_CURRENCY, + PROP_TAG, PT_APPTIME, - PT_ERROR, + PT_BINARY, PT_BOOLEAN, - PT_OBJECT, - PT_I8, - PT_STRING8, - PT_UNICODE, - PT_SYSTIME, PT_CLSID, - PT_BINARY, - PT_SHORT, - PT_I4, - PT_FLOAT, + PT_CURRENCY, PT_DOUBLE, + PT_ERROR, + PT_FLOAT, + PT_I2, + PT_I4, + PT_I8, + PT_LONG, PT_LONGLONG, - PT_TSTRING, - PT_MV_I2, - PT_MV_LONG, - PT_MV_R4, - PT_MV_DOUBLE, - PT_MV_CURRENCY, PT_MV_APPTIME, - PT_MV_SYSTIME, - PT_MV_STRING8, PT_MV_BINARY, - PT_MV_UNICODE, PT_MV_CLSID, - PT_MV_I8, - PT_MV_SHORT, - PT_MV_I4, + PT_MV_CURRENCY, + PT_MV_DOUBLE, PT_MV_FLOAT, - PT_MV_R8, + PT_MV_I2, + PT_MV_I4, + PT_MV_I8, + PT_MV_LONG, PT_MV_LONGLONG, + PT_MV_R4, + PT_MV_R8, + PT_MV_SHORT, + PT_MV_STRING8, + PT_MV_SYSTIME, PT_MV_TSTRING, - PROP_TAG, + PT_MV_UNICODE, + PT_NULL, + PT_OBJECT, + PT_R4, + PT_SHORT, + PT_STRING8, + PT_SYSTIME, + PT_TSTRING, + PT_UNICODE, + PT_UNSPECIFIED, ) - AB_SHOW_PHANTOMS = 2 AB_SHOW_OTHERS = 4 diff --git a/com/win32comext/mapi/mapiutil.py b/com/win32comext/mapi/mapiutil.py index 71014a467e..ab89e6adfb 100644 --- a/com/win32comext/mapi/mapiutil.py +++ b/com/win32comext/mapi/mapiutil.py @@ -3,8 +3,9 @@ TupleType = tuple ListType = list IntType = int -from pywintypes import TimeType import pythoncom +from pywintypes import TimeType + from . import mapi, mapitags prTable = {} diff --git a/com/win32comext/shell/demos/IActiveDesktop.py b/com/win32comext/shell/demos/IActiveDesktop.py index 14642f049c..c60ef3c8fa 100644 --- a/com/win32comext/shell/demos/IActiveDesktop.py +++ b/com/win32comext/shell/demos/IActiveDesktop.py @@ -1,7 +1,8 @@ -from win32com.shell import shell, shellcon -import pythoncom import time +import pythoncom +from win32com.shell import shell, shellcon + website = "https://github.com/mhammond/pywin32/" iad = pythoncom.CoCreateInstance( shell.CLSID_ActiveDesktop, diff --git a/com/win32comext/shell/demos/IFileOperationProgressSink.py b/com/win32comext/shell/demos/IFileOperationProgressSink.py index 5018b8e9c2..de117ad0f0 100644 --- a/com/win32comext/shell/demos/IFileOperationProgressSink.py +++ b/com/win32comext/shell/demos/IFileOperationProgressSink.py @@ -2,8 +2,8 @@ # some basic info import pythoncom -from win32com.shell import shell, shellcon from win32com.server.policy import DesignatedWrapPolicy +from win32com.shell import shell, shellcon tsf_flags = list( (k, v) for k, v in list(shellcon.__dict__.items()) if k.startswith("TSF_") diff --git a/com/win32comext/shell/demos/IShellLinkDataList.py b/com/win32comext/shell/demos/IShellLinkDataList.py index 28a25fd256..4327dc701d 100644 --- a/com/win32comext/shell/demos/IShellLinkDataList.py +++ b/com/win32comext/shell/demos/IShellLinkDataList.py @@ -1,5 +1,9 @@ +import os +import sys + +import pythoncom +import win32api from win32com.shell import shell, shellcon -import pythoncom, win32api, os, sys temp_dir = win32api.GetTempPath() linkname = win32api.GetTempFileName(temp_dir, "cmd")[0] diff --git a/com/win32comext/shell/demos/ITransferAdviseSink.py b/com/win32comext/shell/demos/ITransferAdviseSink.py index 65363e61f5..0eafeb9e39 100644 --- a/com/win32comext/shell/demos/ITransferAdviseSink.py +++ b/com/win32comext/shell/demos/ITransferAdviseSink.py @@ -1,8 +1,8 @@ # ITransferAdviseSink implementation template import pythoncom -from win32com.shell import shell, shellcon from win32com.server.policy import DesignatedWrapPolicy +from win32com.shell import shell, shellcon tsf_flags = list( (k, v) for k, v in list(shellcon.__dict__.items()) if k.startswith("TSF_") diff --git a/com/win32comext/shell/demos/IUniformResourceLocator.py b/com/win32comext/shell/demos/IUniformResourceLocator.py index 3fdc3cf9d2..5a48efcb82 100644 --- a/com/win32comext/shell/demos/IUniformResourceLocator.py +++ b/com/win32comext/shell/demos/IUniformResourceLocator.py @@ -1,6 +1,8 @@ +import os + import pythoncom +import win32api from win32com.shell import shell, shellcon -import win32api, os class InternetShortcut: diff --git a/com/win32comext/shell/demos/browse_for_folder.py b/com/win32comext/shell/demos/browse_for_folder.py index 32ff4f4710..dfa1e0543f 100644 --- a/com/win32comext/shell/demos/browse_for_folder.py +++ b/com/win32comext/shell/demos/browse_for_folder.py @@ -1,8 +1,9 @@ # A couple of samples using SHBrowseForFolder -import sys, os -from win32com.shell import shell, shellcon +import os + import win32gui +from win32com.shell import shell, shellcon # A callback procedure - called by SHBrowseForFolder diff --git a/com/win32comext/shell/demos/create_link.py b/com/win32comext/shell/demos/create_link.py index 354561b7c5..906454c53d 100644 --- a/com/win32comext/shell/demos/create_link.py +++ b/com/win32comext/shell/demos/create_link.py @@ -1,8 +1,10 @@ # link.py # From a demo by Mark Hammond, corrupted by Mike Fletcher # (and re-corrupted by Mark Hammond :-) +import os + +import pythoncom from win32com.shell import shell -import pythoncom, os class PyShortcut: diff --git a/com/win32comext/shell/demos/dump_link.py b/com/win32comext/shell/demos/dump_link.py index dc4b080a56..b9b31b3331 100644 --- a/com/win32comext/shell/demos/dump_link.py +++ b/com/win32comext/shell/demos/dump_link.py @@ -1,9 +1,11 @@ # dump_link.py - dumps information about shell shortcuts # -import sys, os -from win32com.shell import shell, shellcon -import pythoncom import glob +import os +import sys + +import pythoncom +from win32com.shell import shell, shellcon from win32com.storagecon import * diff --git a/com/win32comext/shell/demos/explorer_browser.py b/com/win32comext/shell/demos/explorer_browser.py index b8687b7190..dbbd76b160 100644 --- a/com/win32comext/shell/demos/explorer_browser.py +++ b/com/win32comext/shell/demos/explorer_browser.py @@ -3,10 +3,13 @@ # * CPU sits at 100% while running. import sys + import pythoncom +import win32api +import win32con +import win32gui +from win32com.server.util import unwrap, wrap from win32com.shell import shell, shellcon -import win32gui, win32con, win32api -from win32com.server.util import wrap, unwrap # event handler for the browser. IExplorerBrowserEvents_Methods = """OnNavigationComplete OnNavigationFailed diff --git a/com/win32comext/shell/demos/servers/column_provider.py b/com/win32comext/shell/demos/servers/column_provider.py index 2be31e554f..6c8625a448 100644 --- a/com/win32comext/shell/demos/servers/column_provider.py +++ b/com/win32comext/shell/demos/servers/column_provider.py @@ -9,13 +9,14 @@ # * Right-click an explorer column header - select "More" # * Locate column 'pyc size' or 'pyo size', and add it to the view. # This handler is providing that column data. -import sys, os, stat -import pythoncom -from win32com.shell import shell, shellcon +import os +import stat + import commctrl -import winerror -from win32com.server.util import wrap +import pythoncom from pywintypes import IID +from win32com.server.util import wrap +from win32com.shell import shell, shellcon IPersist_Methods = ["GetClassID"] IColumnProvider_Methods = IPersist_Methods + [ diff --git a/com/win32comext/shell/demos/servers/context_menu.py b/com/win32comext/shell/demos/servers/context_menu.py index 930e3b3afd..b92109d738 100644 --- a/com/win32comext/shell/demos/servers/context_menu.py +++ b/com/win32comext/shell/demos/servers/context_menu.py @@ -9,9 +9,9 @@ # the context menu. import pythoncom -from win32com.shell import shell, shellcon -import win32gui import win32con +import win32gui +from win32com.shell import shell, shellcon class ShellExtension: diff --git a/com/win32comext/shell/demos/servers/copy_hook.py b/com/win32comext/shell/demos/servers/copy_hook.py index d46a7d59ca..e5871fd80a 100644 --- a/com/win32comext/shell/demos/servers/copy_hook.py +++ b/com/win32comext/shell/demos/servers/copy_hook.py @@ -5,12 +5,11 @@ # * Open Windows Explorer # * Attempt to move or copy a directory. # * Note our hook's dialog is displayed. -import sys, os + import pythoncom -from win32com.shell import shell, shellcon -import win32gui import win32con -import winerror +import win32gui +from win32com.shell import shell, shellcon # Our shell extension. diff --git a/com/win32comext/shell/demos/servers/empty_volume_cache.py b/com/win32comext/shell/demos/servers/empty_volume_cache.py index c57e7e264a..a257ac1756 100644 --- a/com/win32comext/shell/demos/servers/empty_volume_cache.py +++ b/com/win32comext/shell/demos/servers/empty_volume_cache.py @@ -3,13 +3,15 @@ # # * Execute this script to register the handler # * Start the "disk cleanup" tool - look for "pywin32 compiled files" -import sys, os, stat, time +import os +import stat +import sys + import pythoncom -from win32com.shell import shell, shellcon -from win32com.server.exception import COMException import win32gui -import win32con import winerror +from win32com.server.exception import COMException +from win32com.shell import shell, shellcon # Our shell extension. IEmptyVolumeCache_Methods = ( diff --git a/com/win32comext/shell/demos/servers/folder_view.py b/com/win32comext/shell/demos/servers/folder_view.py index aadc07ca15..383270dff3 100644 --- a/com/win32comext/shell/demos/servers/folder_view.py +++ b/com/win32comext/shell/demos/servers/folder_view.py @@ -5,23 +5,23 @@ # than our own. # XXX - sadly, it doesn't work quite like the original sample. Oh well, # another day... -import sys import os import pickle import random +import sys + +import commctrl +import pythoncom import win32api -import winxpgui as win32gui # the needs vista, let alone xp! import win32con import winerror -import commctrl -import pythoncom -from win32com.util import IIDToInterfaceName -from win32com.server.exception import COMException -from win32com.server.util import wrap as _wrap -from win32com.server.util import NewEnum as _NewEnum -from win32com.shell import shell, shellcon +import winxpgui as win32gui # the needs vista, let alone xp! from win32com.axcontrol import axcontrol # IObjectWithSite from win32com.propsys import propsys +from win32com.server.exception import COMException +from win32com.server.util import NewEnum as _NewEnum, wrap as _wrap +from win32com.shell import shell, shellcon +from win32com.util import IIDToInterfaceName GUID = pythoncom.MakeIID diff --git a/com/win32comext/shell/demos/servers/icon_handler.py b/com/win32comext/shell/demos/servers/icon_handler.py index 0c3c18e8f2..57aa36110b 100644 --- a/com/win32comext/shell/demos/servers/icon_handler.py +++ b/com/win32comext/shell/demos/servers/icon_handler.py @@ -6,15 +6,16 @@ # * Execute this script to register the context menu. # * Open Windows Explorer, and browse to a directory with a .py file. # * Note the pretty, random selection of icons! -import sys, os +# Use glob to locate ico files, and random.choice to pick one. +import glob +import os +import random +import sys + import pythoncom -from win32com.shell import shell, shellcon import win32gui -import win32con import winerror - -# Use glob to locate ico files, and random.choice to pick one. -import glob, random +from win32com.shell import shell, shellcon ico_files = glob.glob(os.path.join(sys.prefix, "*.ico")) if not ico_files: diff --git a/com/win32comext/shell/demos/servers/shell_view.py b/com/win32comext/shell/demos/servers/shell_view.py index bd12e02201..7d8bc51bae 100644 --- a/com/win32comext/shell/demos/servers/shell_view.py +++ b/com/win32comext/shell/demos/servers/shell_view.py @@ -46,17 +46,23 @@ # a field sep just 'cos we can (and 'cos it can't possibly conflict with the # string content) -import sys, os import _thread +import os import pyclbr -import pythoncom -import win32gui, win32gui_struct, win32api, win32con, winerror +import sys + import commctrl -from win32com.shell import shell, shellcon -from win32com.server.util import wrap, NewEnum +import pythoncom +import win32api +import win32con +import win32gui +import win32gui_struct +import winerror +from pywin.scintilla import scintillacon from win32com.server.exception import COMException +from win32com.server.util import NewEnum, wrap +from win32com.shell import shell, shellcon from win32com.util import IIDToInterfaceName -from pywin.scintilla import scintillacon # Set this to 1 to cause debug version to be registered and used. A debug # version will spew output to win32traceutil. diff --git a/com/win32comext/shell/demos/shellexecuteex.py b/com/win32comext/shell/demos/shellexecuteex.py index cf12191293..6111841b20 100644 --- a/com/win32comext/shell/demos/shellexecuteex.py +++ b/com/win32comext/shell/demos/shellexecuteex.py @@ -1,5 +1,5 @@ -from win32com.shell import shell, shellcon import win32con +from win32com.shell import shell, shellcon def ExplorePIDL(): diff --git a/com/win32comext/shell/demos/viewstate.py b/com/win32comext/shell/demos/viewstate.py index 794aeb575b..e3b7fc157d 100644 --- a/com/win32comext/shell/demos/viewstate.py +++ b/com/win32comext/shell/demos/viewstate.py @@ -4,9 +4,11 @@ it can be read raw from one folder and copied to another's view state. """ -from win32com.shell import shell, shellcon +import os +import sys + import pythoncom -import os, sys +from win32com.shell import shell, shellcon template_folder = os.path.split(sys.executable)[0] print("Template folder:", template_folder) diff --git a/com/win32comext/shell/test/testSHFileOperation.py b/com/win32comext/shell/test/testSHFileOperation.py index f07730c659..8a89688215 100644 --- a/com/win32comext/shell/test/testSHFileOperation.py +++ b/com/win32comext/shell/test/testSHFileOperation.py @@ -1,7 +1,8 @@ -from win32com.shell import shell, shellcon -import win32api import os +import win32api +from win32com.shell import shell, shellcon + def testSHFileOperation(file_cnt): temp_dir = os.environ["temp"] diff --git a/com/win32comext/shell/test/testShellItem.py b/com/win32comext/shell/test/testShellItem.py index 4490af5e0f..592a3647e6 100644 --- a/com/win32comext/shell/test/testShellItem.py +++ b/com/win32comext/shell/test/testShellItem.py @@ -1,7 +1,8 @@ # Test IShellItem and related interfaces -from win32com.shell import shell, shellcon, knownfolders import unittest +from win32com.shell import knownfolders, shell, shellcon + class TestShellItem(unittest.TestCase): def assertShellItemsEqual(self, i1, i2): diff --git a/com/win32comext/taskscheduler/test/test_addtask.py b/com/win32comext/taskscheduler/test/test_addtask.py index ab9f59c8de..a7b0959d6d 100644 --- a/com/win32comext/taskscheduler/test/test_addtask.py +++ b/com/win32comext/taskscheduler/test/test_addtask.py @@ -1,4 +1,9 @@ -import pythoncom, sys, os, time, win32api +import os +import sys +import time + +import pythoncom +import win32api from win32com.taskscheduler import taskscheduler task_name = "test_addtask.job" diff --git a/com/win32comext/taskscheduler/test/test_addtask_1.py b/com/win32comext/taskscheduler/test/test_addtask_1.py index 830d7960e2..29c9e08d2e 100644 --- a/com/win32comext/taskscheduler/test/test_addtask_1.py +++ b/com/win32comext/taskscheduler/test/test_addtask_1.py @@ -1,4 +1,7 @@ -import pythoncom, time, win32api +import time + +import pythoncom +import win32api from win32com.taskscheduler import taskscheduler test_task_name = "test_addtask_1.job" diff --git a/com/win32comext/taskscheduler/test/test_addtask_2.py b/com/win32comext/taskscheduler/test/test_addtask_2.py index 57796754d7..4663bea46f 100644 --- a/com/win32comext/taskscheduler/test/test_addtask_2.py +++ b/com/win32comext/taskscheduler/test/test_addtask_2.py @@ -1,4 +1,7 @@ -import pythoncom, time, win32api +import time + +import pythoncom +import win32api from win32com.taskscheduler import taskscheduler task_name = "test_addtask_2.job" diff --git a/format_all.bat b/format_all.bat new file mode 100644 index 0000000000..10b8aeddbd --- /dev/null +++ b/format_all.bat @@ -0,0 +1,3 @@ +pycln . --config=pycln.toml +isort . +black . diff --git a/isapi/install.py b/isapi/install.py index 76b263abd4..154f82aff3 100644 --- a/isapi/install.py +++ b/isapi/install.py @@ -2,14 +2,18 @@ # this code adapted from "Tomcat JK2 ISAPI redirector", part of Apache # Created July 2004, Mark Hammond. -import sys, os, imp, shutil, stat -import operator -from win32com.client import GetObject, Dispatch -from win32com.client.gencache import EnsureModule, EnsureDispatch -import win32api +import imp +import os +import shutil +import stat +import sys +import traceback + import pythoncom +import win32api import winerror -import traceback +from win32com.client import Dispatch, GetObject +from win32com.client.gencache import EnsureDispatch, EnsureModule _APP_INPROC = 0 _APP_OUTPROC = 1 diff --git a/isapi/samples/advanced.py b/isapi/samples/advanced.py index d615bccfbe..c10d0c80c9 100644 --- a/isapi/samples/advanced.py +++ b/isapi/samples/advanced.py @@ -13,9 +13,12 @@ # tools are installed, but you should always see the reason written # to the Windows event log - see the IIS documentation for more. +import os +import stat +import sys + from isapi import isapicon from isapi.simple import SimpleExtension -import sys, os, stat if hasattr(sys, "isapidllhandle"): import win32traceutil @@ -54,8 +57,14 @@ # your module, the existing module will avoid the NameError, and allow # you to reload that module. +import threading + +import win32con +import win32event +import win32file +import winerror + from isapi import InternalReloadException -import win32event, win32file, winerror, win32con, threading try: reload_counter += 1 diff --git a/isapi/samples/redirector.py b/isapi/samples/redirector.py index 2f913d250a..40698bb2c0 100644 --- a/isapi/samples/redirector.py +++ b/isapi/samples/redirector.py @@ -16,15 +16,16 @@ # an example. If this sample is run on IIS5 or earlier it simply ignores # any excludes. -from isapi import isapicon, threaded_extension import sys -import traceback + +from isapi import isapicon, threaded_extension try: from urllib.request import urlopen except ImportError: # py3k spelling... from urllib.request import urlopen + import win32api # sys.isapidllhandle will exist when we are loaded by the IIS framework. diff --git a/isapi/samples/redirector_asynch.py b/isapi/samples/redirector_asynch.py index a6e724bdde..3c4b5e4f77 100644 --- a/isapi/samples/redirector_asynch.py +++ b/isapi/samples/redirector_asynch.py @@ -4,10 +4,12 @@ # back to the client (it does *not* use asynch io talking to the remote # server!) -from isapi import isapicon, threaded_extension import sys -import traceback -import urllib.request, urllib.parse, urllib.error +import urllib.error +import urllib.parse +import urllib.request + +from isapi import isapicon, threaded_extension # sys.isapidllhandle will exist when we are loaded by the IIS framework. # In this case we redirect our output to the win32traceutil collector. diff --git a/isapi/samples/redirector_with_filter.py b/isapi/samples/redirector_with_filter.py index 05e2aff690..a63b1db13a 100644 --- a/isapi/samples/redirector_with_filter.py +++ b/isapi/samples/redirector_with_filter.py @@ -32,11 +32,13 @@ # This sample is very small - it avoid most error handling, etc. It is for # demonstration purposes only. +import sys +import urllib.error +import urllib.parse +import urllib.request + from isapi import isapicon, threaded_extension from isapi.simple import SimpleFilter -import sys -import traceback -import urllib.request, urllib.parse, urllib.error # sys.isapidllhandle will exist when we are loaded by the IIS framework. # In this case we redirect our output to the win32traceutil collector. diff --git a/isapi/samples/test.py b/isapi/samples/test.py index 261c2e3f3e..5e4d899bb6 100644 --- a/isapi/samples/test.py +++ b/isapi/samples/test.py @@ -2,16 +2,25 @@ # designed to be a simple sample, but instead is a hotch-potch of things # that attempts to exercise the framework. +import os +import stat +import sys + from isapi import isapicon from isapi.simple import SimpleExtension -import sys, os, stat if hasattr(sys, "isapidllhandle"): import win32traceutil # We use the same reload support as 'advanced.py' demonstrates. +import threading + +import win32con +import win32event +import win32file +import winerror + from isapi import InternalReloadException -import win32event, win32file, winerror, win32con, threading # A watcher thread that checks for __file__ changing. diff --git a/isapi/test/extension_simple.py b/isapi/test/extension_simple.py index 010ad88faf..64bd71fd22 100644 --- a/isapi/test/extension_simple.py +++ b/isapi/test/extension_simple.py @@ -6,15 +6,17 @@ # This will execute the method 'test1' below. See below for the list of # test methods that are acceptable. -from isapi import isapicon, threaded_extension, ExtensionError -from isapi.simple import SimpleFilter -import traceback -import urllib.request, urllib.parse, urllib.error -import winerror +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 try: win32api.GetConsoleTitle() diff --git a/isapi/threaded_extension.py b/isapi/threaded_extension.py index c4628f344d..b31c8c9e70 100644 --- a/isapi/threaded_extension.py +++ b/isapi/threaded_extension.py @@ -2,21 +2,22 @@ # $Id$ import sys +import threading import time -from isapi import isapicon, ExtensionError -import isapi.simple +import traceback + +from pywintypes import OVERLAPPED +from win32event import INFINITE from win32file import ( - GetQueuedCompletionStatus, + CloseHandle, CreateIoCompletionPort, + GetQueuedCompletionStatus, PostQueuedCompletionStatus, - CloseHandle, ) from win32security import SetThreadToken -from win32event import INFINITE -from pywintypes import OVERLAPPED -import threading -import traceback +import isapi.simple +from isapi import ExtensionError, isapicon ISAPI_REQUEST = 1 ISAPI_SHUTDOWN = 2 diff --git a/pycln.toml b/pycln.toml new file mode 100644 index 0000000000..49e81c8a12 --- /dev/null +++ b/pycln.toml @@ -0,0 +1,24 @@ +[tool.pycln] +# Many imports with side-effects +all = false +skip_imports = [ + # Star imported C wrapped modules + "_winxptheme", + "dde", + "ntsecuritycon", + "odbc", + "win32api", + "win32clipboard", + "win32com", + "win32cryptcon", + "win32event", + "win32file", + "win32gui_struct", + "win32gui", + "win32inet", + "win32inetcon", + "win32pipe", + "win32ras", + "win32ui", + "winxpgui", +] diff --git a/pywin32_postinstall.py b/pywin32_postinstall.py index a2aa4b1e58..147f0cde7b 100644 --- a/pywin32_postinstall.py +++ b/pywin32_postinstall.py @@ -2,10 +2,10 @@ # # copies PyWinTypesxx.dll and PythonCOMxx.dll into the system directory, # and creates a pth file -import os -import sys import glob +import os import shutil +import sys import sysconfig try: @@ -141,7 +141,8 @@ def get_special_folder_path(path_name): def CopyTo(desc, src, dest): - import win32api, win32con + import win32api + import win32con while 1: try: @@ -177,7 +178,8 @@ def CopyTo(desc, src, dest): # our pywintypes_system32 directory. def LoadSystemModule(lib_dir, modname): # See if this is a debug build. - import importlib.util, importlib.machinery + import importlib.machinery + import importlib.util suffix = "_d" if "_d.pyd" in importlib.machinery.EXTENSION_SUFFIXES else "" filename = "%s%d%d%s.dll" % ( @@ -377,7 +379,8 @@ def fixup_dbi(): # We used to have a dbi.pyd with our .pyd files, but now have a .py file. # If the user didn't uninstall, they will find the .pyd which will cause # problems - so handle that. - import win32api, win32con + import win32api + import win32con pyd_name = os.path.join(os.path.dirname(win32api.__file__), "dbi.pyd") pyd_d_name = os.path.join(os.path.dirname(win32api.__file__), "dbi_d.pyd") diff --git a/pywin32_testall.py b/pywin32_testall.py index da3de92498..a54f9d4fa8 100644 --- a/pywin32_testall.py +++ b/pywin32_testall.py @@ -1,8 +1,8 @@ """A test runner for pywin32""" -import sys import os import site import subprocess +import sys # locate the dirs based on where this script is - it may be either in the # source tree, or in an installed Python 'Scripts' tree. diff --git a/setup.py b/setup.py index fc390a8725..20ad0cbf6c 100644 --- a/setup.py +++ b/setup.py @@ -23,37 +23,34 @@ required for an official build - see README.md for that process. """ # Originally by Thomas Heller, started in 2000 or so. -import os -import sys import glob -import re -from tempfile import gettempdir +import os import platform +import re import shutil import subprocess - +import sys import winreg +from distutils import log +from distutils.command.build import build +from distutils.command.install import install +from distutils.command.install_data import install_data +from distutils.command.install_lib import install_lib +from distutils.core import Extension +from tempfile import gettempdir # The rest of our imports. from setuptools import setup -from distutils.core import Extension -from distutils.command.install import install -from distutils.command.install_lib import install_lib from setuptools.command.build_ext import build_ext -from distutils.command.build import build -from distutils.command.install_data import install_data - -from distutils import log - # some modules need a static CRT to avoid problems caused by them having a # manifest. static_crt_modules = ["winxpgui"] +import distutils.util from distutils.dep_util import newer_group from distutils.filelist import FileList -import distutils.util build_id_patch = build_id if not "." in build_id_patch: diff --git a/win32/Demos/BackupRead_BackupWrite.py b/win32/Demos/BackupRead_BackupWrite.py index 8b923eaccf..0e9fc9f920 100644 --- a/win32/Demos/BackupRead_BackupWrite.py +++ b/win32/Demos/BackupRead_BackupWrite.py @@ -1,10 +1,15 @@ ## demonstrates using BackupRead and BackupWrite to copy all of a file's data streams -import win32file, win32api, win32con, win32security, ntsecuritycon + +import ntsecuritycon +import pythoncom +import pywintypes +import win32api +import win32con +import win32file +import win32security +from pywin32_testutil import ob2memory, str2bytes from win32com import storagecon -import pythoncom, pywintypes -import struct, traceback -from pywin32_testutil import str2bytes, ob2memory all_sd_info = ( win32security.DACL_SECURITY_INFORMATION diff --git a/win32/Demos/BackupSeek_streamheaders.py b/win32/Demos/BackupSeek_streamheaders.py index e2d4df56d4..8b828d1d5e 100644 --- a/win32/Demos/BackupSeek_streamheaders.py +++ b/win32/Demos/BackupSeek_streamheaders.py @@ -1,8 +1,12 @@ ## demonstrates using BackupSeek to enumerate data streams for a file -import win32file, win32api, win32con +import struct + +import pythoncom +import pywintypes +import win32api +import win32con +import win32file from win32com import storagecon -import pythoncom, pywintypes -import struct, traceback stream_types = { win32con.BACKUP_DATA: "Standard data", diff --git a/win32/Demos/CopyFileEx.py b/win32/Demos/CopyFileEx.py index 3b3c6da66b..cdac78e5d7 100644 --- a/win32/Demos/CopyFileEx.py +++ b/win32/Demos/CopyFileEx.py @@ -1,5 +1,5 @@ -import win32file, win32api -import os +import win32api +import win32file def ProgressRoutine( diff --git a/win32/Demos/CreateFileTransacted_MiniVersion.py b/win32/Demos/CreateFileTransacted_MiniVersion.py index 0d1384e39d..fd600b5908 100644 --- a/win32/Demos/CreateFileTransacted_MiniVersion.py +++ b/win32/Demos/CreateFileTransacted_MiniVersion.py @@ -4,10 +4,15 @@ miniversion (effectively a savepoint within a transaction). """ -import win32file, win32api, win32transaction, winerror -import win32con, winioctlcon -import struct import os +import struct + +import win32api +import win32con +import win32file +import win32transaction +import winerror +import winioctlcon from pywin32_testutil import str2bytes # py3k-friendly helper diff --git a/win32/Demos/EvtSubscribe_pull.py b/win32/Demos/EvtSubscribe_pull.py index 4f014d569c..f405979641 100644 --- a/win32/Demos/EvtSubscribe_pull.py +++ b/win32/Demos/EvtSubscribe_pull.py @@ -1,5 +1,7 @@ ## Demonstrates how to create a "pull" subscription -import win32evtlog, win32event, win32con +import win32con +import win32event +import win32evtlog query_text = '*[System[Provider[@Name="Microsoft-Windows-Winlogon"]]]' diff --git a/win32/Demos/FileSecurityTest.py b/win32/Demos/FileSecurityTest.py index fc6a2ef0dc..90c454833f 100644 --- a/win32/Demos/FileSecurityTest.py +++ b/win32/Demos/FileSecurityTest.py @@ -1,6 +1,11 @@ # Contributed by Kelly Kranabetter. -import os, sys -import win32security, ntsecuritycon, pywintypes, winerror +import os +import sys + +import ntsecuritycon +import pywintypes +import win32security +import winerror # get security information # name=r"c:\autoexec.bat" diff --git a/win32/Demos/GetSaveFileName.py b/win32/Demos/GetSaveFileName.py index 9e93489f60..2858750529 100644 --- a/win32/Demos/GetSaveFileName.py +++ b/win32/Demos/GetSaveFileName.py @@ -1,4 +1,7 @@ -import win32gui, win32con, os +import os + +import win32con +import win32gui filter = "Python Scripts\0*.py;*.pyw;*.pys\0Text files\0*.txt\0" customfilter = "Other file types\0*.*\0" diff --git a/win32/Demos/NetValidatePasswordPolicy.py b/win32/Demos/NetValidatePasswordPolicy.py index d724040e5e..86c3bc40bd 100644 --- a/win32/Demos/NetValidatePasswordPolicy.py +++ b/win32/Demos/NetValidatePasswordPolicy.py @@ -24,13 +24,14 @@ > Result of 'auth' validation is 2701: Password must change at next logon """ -import sys -import win32api -import win32net, win32netcon - import optparse +import sys from pprint import pprint +import win32api +import win32net +import win32netcon + def main(): parser = optparse.OptionParser( diff --git a/win32/Demos/OpenEncryptedFileRaw.py b/win32/Demos/OpenEncryptedFileRaw.py index 775d06e53f..aa0f2a7c15 100644 --- a/win32/Demos/OpenEncryptedFileRaw.py +++ b/win32/Demos/OpenEncryptedFileRaw.py @@ -1,6 +1,9 @@ -import win32file, win32api, winerror import os +import win32api +import win32file +import winerror + def ReadCallback(input_buffer, data, buflen): fnamein, fnameout, f = data diff --git a/win32/Demos/RegCreateKeyTransacted.py b/win32/Demos/RegCreateKeyTransacted.py index d36d5e90e0..687f07ae6b 100644 --- a/win32/Demos/RegCreateKeyTransacted.py +++ b/win32/Demos/RegCreateKeyTransacted.py @@ -1,4 +1,6 @@ -import win32api, win32con, win32transaction +import win32api +import win32con +import win32transaction keyname = "Pywin32 test transacted registry functions" subkeyname = "test transacted subkey" diff --git a/win32/Demos/RegRestoreKey.py b/win32/Demos/RegRestoreKey.py index 5c72e67901..69ce32ea6f 100644 --- a/win32/Demos/RegRestoreKey.py +++ b/win32/Demos/RegRestoreKey.py @@ -1,7 +1,11 @@ -import win32api, win32security -import win32con, ntsecuritycon, winnt import os +import ntsecuritycon +import win32api +import win32con +import win32security +import winnt + temp_dir = win32api.GetTempPath() fname = win32api.GetTempFileName(temp_dir, "rsk")[0] print(fname) diff --git a/win32/Demos/SystemParametersInfo.py b/win32/Demos/SystemParametersInfo.py index e430e6f688..55a331e673 100644 --- a/win32/Demos/SystemParametersInfo.py +++ b/win32/Demos/SystemParametersInfo.py @@ -1,4 +1,10 @@ -import win32gui, win32con, win32api, time, os, glob +import glob +import os +import time + +import win32api +import win32con +import win32gui ## some of these tests will fail for systems prior to XP diff --git a/win32/Demos/c_extension/setup.py b/win32/Demos/c_extension/setup.py index 399abbc778..6f5cb41769 100644 --- a/win32/Demos/c_extension/setup.py +++ b/win32/Demos/c_extension/setup.py @@ -3,7 +3,7 @@ # # Use 'python setup.py build' to build this extension. import os -from distutils.core import setup, Extension +from distutils.core import Extension, setup from sysconfig import get_paths sources = ["win32_extension.cpp"] diff --git a/win32/Demos/cerapi.py b/win32/Demos/cerapi.py index c666a189bb..c5d9316601 100644 --- a/win32/Demos/cerapi.py +++ b/win32/Demos/cerapi.py @@ -2,13 +2,14 @@ # # This connects to a CE device, and interacts with it. -import wincerapi -import win32event -import win32api -import win32con +import getopt import os import sys -import getopt + +import win32api +import win32con +import win32event +import wincerapi def DumpPythonRegistry(): diff --git a/win32/Demos/dde/ddeclient.py b/win32/Demos/dde/ddeclient.py index 2f5ba55079..32af3130ff 100644 --- a/win32/Demos/dde/ddeclient.py +++ b/win32/Demos/dde/ddeclient.py @@ -1,7 +1,7 @@ # 'Request' example added jjk 11/20/98 -import win32ui import dde +import win32ui server = dde.CreateServer() server.Create("TestClient") diff --git a/win32/Demos/dde/ddeserver.py b/win32/Demos/dde/ddeserver.py index 5f0a36e534..0374827f01 100644 --- a/win32/Demos/dde/ddeserver.py +++ b/win32/Demos/dde/ddeserver.py @@ -1,8 +1,8 @@ # 'Request' example added jjk 11/20/98 +import dde import win32ui from pywin.mfc import object -import dde class MySystemTopic(object.Object): diff --git a/win32/Demos/desktopmanager.py b/win32/Demos/desktopmanager.py index 0a524e60db..6ffaf2a94b 100644 --- a/win32/Demos/desktopmanager.py +++ b/win32/Demos/desktopmanager.py @@ -1,9 +1,16 @@ # Demonstrates using a taskbar icon to create and navigate between desktops -import win32api, win32con, win32gui, win32service, win32process -import pywintypes -import traceback, _thread, time +import _thread import io +import time +import traceback + +import pywintypes +import win32api +import win32con +import win32gui +import win32process +import win32service ## "Shell_TrayWnd" is class of system tray window, broadcasts "TaskbarCreated" when initialized diff --git a/win32/Demos/eventLogDemo.py b/win32/Demos/eventLogDemo.py index c49fc16a03..8d4220b070 100644 --- a/win32/Demos/eventLogDemo.py +++ b/win32/Demos/eventLogDemo.py @@ -1,9 +1,8 @@ -import win32evtlog -import win32api +import win32api # To translate NT Sids to account names. import win32con -import win32security # To translate NT Sids to account names. - +import win32evtlog import win32evtlogutil +import win32security def ReadLog(computer, logType="Application", dumpEachRecord=0): @@ -77,7 +76,8 @@ def test(): print("This sample only runs on NT") return - import sys, getopt + import getopt + import sys opts, args = getopt.getopt(sys.argv[1:], "rwh?c:t:v") computer = None diff --git a/win32/Demos/getfilever.py b/win32/Demos/getfilever.py index 8138f30f64..721e72f35d 100644 --- a/win32/Demos/getfilever.py +++ b/win32/Demos/getfilever.py @@ -1,4 +1,6 @@ -import os, win32api +import os + +import win32api ver_strings = ( "Comments", diff --git a/win32/Demos/mmapfile_demo.py b/win32/Demos/mmapfile_demo.py index 31ab03a093..9068ce72fd 100644 --- a/win32/Demos/mmapfile_demo.py +++ b/win32/Demos/mmapfile_demo.py @@ -1,6 +1,9 @@ -import win32api, mmapfile +import os +import tempfile + +import mmapfile +import win32api import winerror -import tempfile, os from pywin32_testutil import str2bytes system_info = win32api.GetSystemInfo() diff --git a/win32/Demos/pipes/runproc.py b/win32/Demos/pipes/runproc.py index f823717dfd..2ed02dd3da 100644 --- a/win32/Demos/pipes/runproc.py +++ b/win32/Demos/pipes/runproc.py @@ -4,14 +4,15 @@ Try to write to and read from those. """ +import msvcrt +import os + import win32api -import win32pipe +import win32con import win32file +import win32pipe import win32process import win32security -import win32con -import msvcrt -import os class Process: diff --git a/win32/Demos/print_desktop.py b/win32/Demos/print_desktop.py index 37b84682e4..d06504e21b 100644 --- a/win32/Demos/print_desktop.py +++ b/win32/Demos/print_desktop.py @@ -1,4 +1,8 @@ -import win32print, pywintypes, win32con, win32gui, win32api +import pywintypes +import win32api +import win32con +import win32gui +import win32print pname = win32print.GetDefaultPrinter() print(pname) diff --git a/win32/Demos/rastest.py b/win32/Demos/rastest.py index 566edcb31e..669a2a800b 100644 --- a/win32/Demos/rastest.py +++ b/win32/Demos/rastest.py @@ -1,8 +1,9 @@ # rastest.py - test/demonstrate the win32ras module. # Much of the code here contributed by Jethro Wright. -import sys import os +import sys + import win32ras # Build a little dictionary of RAS states to decent strings. diff --git a/win32/Demos/security/GetTokenInformation.py b/win32/Demos/security/GetTokenInformation.py index ceca2c4d95..192c549e1b 100644 --- a/win32/Demos/security/GetTokenInformation.py +++ b/win32/Demos/security/GetTokenInformation.py @@ -2,14 +2,17 @@ including UAC status on Vista """ -import pywintypes, win32api, win32security -import win32con, winerror +import pywintypes +import win32api +import win32con +import win32security +import winerror from security_enums import ( + SECURITY_IMPERSONATION_LEVEL, + TOKEN_ELEVATION_TYPE, TOKEN_GROUP_ATTRIBUTES, TOKEN_PRIVILEGE_ATTRIBUTES, - SECURITY_IMPERSONATION_LEVEL, TOKEN_TYPE, - TOKEN_ELEVATION_TYPE, ) diff --git a/win32/Demos/security/account_rights.py b/win32/Demos/security/account_rights.py index 5c800c35db..357b789a51 100644 --- a/win32/Demos/security/account_rights.py +++ b/win32/Demos/security/account_rights.py @@ -1,5 +1,9 @@ -import win32security, win32file, win32api, ntsecuritycon, win32con -from security_enums import TRUSTEE_TYPE, TRUSTEE_FORM, ACE_FLAGS, ACCESS_MODE +import ntsecuritycon +import win32api +import win32con +import win32file +import win32security +from security_enums import ACCESS_MODE, ACE_FLAGS, TRUSTEE_FORM, TRUSTEE_TYPE new_privs = ( ( diff --git a/win32/Demos/security/explicit_entries.py b/win32/Demos/security/explicit_entries.py index ba6878b645..b04f45173f 100644 --- a/win32/Demos/security/explicit_entries.py +++ b/win32/Demos/security/explicit_entries.py @@ -1,6 +1,11 @@ import os -import win32security, win32file, win32api, ntsecuritycon, win32con -from security_enums import TRUSTEE_TYPE, TRUSTEE_FORM, ACE_FLAGS, ACCESS_MODE + +import ntsecuritycon +import win32api +import win32con +import win32file +import win32security +from security_enums import ACCESS_MODE, ACE_FLAGS, TRUSTEE_FORM, TRUSTEE_TYPE fname = os.path.join(win32api.GetTempPath(), "win32security_test.txt") f = open(fname, "w") diff --git a/win32/Demos/security/get_policy_info.py b/win32/Demos/security/get_policy_info.py index 2666dca97b..1eba9cd0d0 100644 --- a/win32/Demos/security/get_policy_info.py +++ b/win32/Demos/security/get_policy_info.py @@ -1,4 +1,7 @@ -import win32security, win32file, win32api, ntsecuritycon, win32con +import ntsecuritycon +import win32api +import win32file +import win32security policy_handle = win32security.GetPolicyHandle("rupole", win32security.POLICY_ALL_ACCESS) diff --git a/win32/Demos/security/list_rights.py b/win32/Demos/security/list_rights.py index 5d4dba0b34..780008a252 100644 --- a/win32/Demos/security/list_rights.py +++ b/win32/Demos/security/list_rights.py @@ -1,5 +1,9 @@ -import win32security, win32file, win32api, ntsecuritycon, win32con -from security_enums import TRUSTEE_TYPE, TRUSTEE_FORM, ACE_FLAGS, ACCESS_MODE +import ntsecuritycon +import win32api +import win32con +import win32file +import win32security +from security_enums import ACCESS_MODE, ACE_FLAGS, TRUSTEE_FORM, TRUSTEE_TYPE new_privs = ( ( diff --git a/win32/Demos/security/localized_names.py b/win32/Demos/security/localized_names.py index a31f267779..30a0bde6d3 100644 --- a/win32/Demos/security/localized_names.py +++ b/win32/Demos/security/localized_names.py @@ -3,10 +3,11 @@ # http://support.microsoft.com/default.aspx?kbid=157234 import sys -from win32net import NetUserModalsGet -from win32security import LookupAccountSid + import pywintypes from ntsecuritycon import * +from win32net import NetUserModalsGet +from win32security import LookupAccountSid def LookupAliasFromRid(TargetComputer, Rid): diff --git a/win32/Demos/security/lsaregevent.py b/win32/Demos/security/lsaregevent.py index 9c52638089..38e7adc9cb 100644 --- a/win32/Demos/security/lsaregevent.py +++ b/win32/Demos/security/lsaregevent.py @@ -1,4 +1,5 @@ -import win32security, win32event +import win32event +import win32security evt = win32event.CreateEvent(None, 0, 0, None) win32security.LsaRegisterPolicyChangeNotification( diff --git a/win32/Demos/security/query_information.py b/win32/Demos/security/query_information.py index 34483a0c16..9fa3e4a956 100644 --- a/win32/Demos/security/query_information.py +++ b/win32/Demos/security/query_information.py @@ -1,5 +1,7 @@ +import win32api +import win32security +import winerror from ntsecuritycon import * -import win32api, win32security, winerror # This is a Python implementation of win32api.GetDomainName() diff --git a/win32/Demos/security/regsave_sa.py b/win32/Demos/security/regsave_sa.py index 164859a556..29a6ac1059 100644 --- a/win32/Demos/security/regsave_sa.py +++ b/win32/Demos/security/regsave_sa.py @@ -1,6 +1,12 @@ fname = "h:\\tmp.reg" -import win32api, win32con, win32security, ntsecuritycon, pywintypes, os +import os + +import ntsecuritycon +import pywintypes +import win32api +import win32con +import win32security ## regsave will not overwrite a file if os.path.isfile(fname): diff --git a/win32/Demos/security/regsecurity.py b/win32/Demos/security/regsecurity.py index 8c9b7c315f..3bac65c08e 100644 --- a/win32/Demos/security/regsecurity.py +++ b/win32/Demos/security/regsecurity.py @@ -1,4 +1,7 @@ -import win32api, win32con, win32security, ntsecuritycon +import ntsecuritycon +import win32api +import win32con +import win32security new_privs = ( ( diff --git a/win32/Demos/security/sa_inherit.py b/win32/Demos/security/sa_inherit.py index 12c3c5ad67..a2855e5044 100644 --- a/win32/Demos/security/sa_inherit.py +++ b/win32/Demos/security/sa_inherit.py @@ -1,4 +1,5 @@ -import pywintypes, win32security +import pywintypes +import win32security sa = pywintypes.SECURITY_ATTRIBUTES() tmp_sid = win32security.LookupAccountName("", "tmp")[0] diff --git a/win32/Demos/security/security_enums.py b/win32/Demos/security/security_enums.py index 482ff7323b..ab3cc6d361 100644 --- a/win32/Demos/security/security_enums.py +++ b/win32/Demos/security/security_enums.py @@ -1,4 +1,6 @@ -import win32security, ntsecuritycon, winnt +import ntsecuritycon +import win32security +import winnt class Enum: diff --git a/win32/Demos/security/set_file_audit.py b/win32/Demos/security/set_file_audit.py index 7bea5508a8..324d72748d 100644 --- a/win32/Demos/security/set_file_audit.py +++ b/win32/Demos/security/set_file_audit.py @@ -1,13 +1,19 @@ -import win32security, win32file, win32api, ntsecuritycon, win32con, os +import os + +import ntsecuritycon +import win32api +import win32con +import win32file +import win32security from win32security import ( ACL_REVISION_DS, CONTAINER_INHERIT_ACE, + DACL_SECURITY_INFORMATION, + GROUP_SECURITY_INFORMATION, OBJECT_INHERIT_ACE, + OWNER_SECURITY_INFORMATION, PROTECTED_DACL_SECURITY_INFORMATION, - DACL_SECURITY_INFORMATION, SACL_SECURITY_INFORMATION, - OWNER_SECURITY_INFORMATION, - GROUP_SECURITY_INFORMATION, SE_FILE_OBJECT, ) diff --git a/win32/Demos/security/set_file_owner.py b/win32/Demos/security/set_file_owner.py index 11525a8fbf..5a384da090 100644 --- a/win32/Demos/security/set_file_owner.py +++ b/win32/Demos/security/set_file_owner.py @@ -1,6 +1,10 @@ fname = r"h:\tmp.txt" -import win32security, win32file, win32api, ntsecuritycon, win32con +import ntsecuritycon +import win32api +import win32con +import win32file +import win32security new_privs = ( ( diff --git a/win32/Demos/security/set_policy_info.py b/win32/Demos/security/set_policy_info.py index f462eb9d49..5dd3cf819d 100644 --- a/win32/Demos/security/set_policy_info.py +++ b/win32/Demos/security/set_policy_info.py @@ -1,4 +1,7 @@ -import win32security, win32file, win32api, ntsecuritycon, win32con +import ntsecuritycon +import win32api +import win32file +import win32security policy_handle = win32security.GetPolicyHandle("rupole", win32security.POLICY_ALL_ACCESS) diff --git a/win32/Demos/security/setkernelobjectsecurity.py b/win32/Demos/security/setkernelobjectsecurity.py index dca63e28c2..34c8f44692 100644 --- a/win32/Demos/security/setkernelobjectsecurity.py +++ b/win32/Demos/security/setkernelobjectsecurity.py @@ -1,4 +1,7 @@ -import win32security, win32api, win32con, win32process +import win32api +import win32con +import win32process +import win32security ## You need SE_RESTORE_NAME to be able to set the owner of a security descriptor to anybody ## other than yourself or your primary group. Most admin logins don't have it by default, so diff --git a/win32/Demos/security/setnamedsecurityinfo.py b/win32/Demos/security/setnamedsecurityinfo.py index c4f9ff3121..8915a0df1a 100644 --- a/win32/Demos/security/setnamedsecurityinfo.py +++ b/win32/Demos/security/setnamedsecurityinfo.py @@ -1,4 +1,7 @@ -import win32security, win32api, win32con, win32process +import win32api +import win32con +import win32process +import win32security fname, tmp = win32api.GetTempFileName(win32api.GetTempPath(), "tmp") print(fname) diff --git a/win32/Demos/security/setsecurityinfo.py b/win32/Demos/security/setsecurityinfo.py index 0a1264bfec..d784d95099 100644 --- a/win32/Demos/security/setsecurityinfo.py +++ b/win32/Demos/security/setsecurityinfo.py @@ -1,4 +1,7 @@ -import win32security, win32api, win32con, win32process +import win32api +import win32con +import win32process +import win32security ## You need SE_RESTORE_NAME to be able to set the owner of a security descriptor to anybody ## other than yourself or your primary group. Most admin logins don't have it by default, so diff --git a/win32/Demos/security/setuserobjectsecurity.py b/win32/Demos/security/setuserobjectsecurity.py index afff57c750..668571f676 100644 --- a/win32/Demos/security/setuserobjectsecurity.py +++ b/win32/Demos/security/setuserobjectsecurity.py @@ -1,4 +1,7 @@ -import win32security, win32api, win32con, win32process +import win32api +import win32con +import win32process +import win32security new_privs = ( ( diff --git a/win32/Demos/security/sspi/fetch_url.py b/win32/Demos/security/sspi/fetch_url.py index f98de4f223..3b43b7e46c 100644 --- a/win32/Demos/security/sspi/fetch_url.py +++ b/win32/Demos/security/sspi/fetch_url.py @@ -7,16 +7,15 @@ root of an IIS server is should work. """ -import sys -import urllib.request, urllib.parse, urllib.error -import http.client +import http.client # sorry, this demo needs 2.3+ +import optparse +import urllib.error import urllib.parse -from base64 import encodestring, decodestring +import urllib.request +from base64 import decodestring, encodestring from sspi import ClientAuth -import optparse # sorry, this demo needs 2.3+ - options = None # set to optparse options object diff --git a/win32/Demos/security/sspi/simple_auth.py b/win32/Demos/security/sspi/simple_auth.py index 5701241c44..cc0ce5cf92 100644 --- a/win32/Demos/security/sspi/simple_auth.py +++ b/win32/Demos/security/sspi/simple_auth.py @@ -3,7 +3,9 @@ # be on different machines (here they are in the same process, but the same # concepts apply) import sspi -import win32security, sspicon, win32api +import sspicon +import win32api +import win32security def lookup_ret_code(err): diff --git a/win32/Demos/security/sspi/socket_server.py b/win32/Demos/security/sspi/socket_server.py index 0f848aa779..4d606bb86b 100644 --- a/win32/Demos/security/sspi/socket_server.py +++ b/win32/Demos/security/sspi/socket_server.py @@ -20,17 +20,15 @@ """ -import sys -import struct +import http.client # sorry, this demo needs 2.3+ +import optparse import socketserver -import win32api -import http.client +import struct import traceback +import sspi +import win32api import win32security -import sspi, sspicon - -import optparse # sorry, this demo needs 2.3+ options = None # set to optparse object. diff --git a/win32/Demos/security/sspi/validate_password.py b/win32/Demos/security/sspi/validate_password.py index f50ce9ae3a..40b6ad5b2f 100644 --- a/win32/Demos/security/sspi/validate_password.py +++ b/win32/Demos/security/sspi/validate_password.py @@ -3,8 +3,9 @@ # # To use with Kerberos you need to jump through the 'targetspn' hoops. -import win32security import sys + +import win32security from sspi import ClientAuth, ServerAuth diff --git a/win32/Demos/service/nativePipeTestService.py b/win32/Demos/service/nativePipeTestService.py index 616f067ed6..4ac05ebafa 100644 --- a/win32/Demos/service/nativePipeTestService.py +++ b/win32/Demos/service/nativePipeTestService.py @@ -12,11 +12,11 @@ # So in short, please make sure you *really* want to do this, otherwise just # stick with the default. -import sys import os -import win32serviceutil -import servicemanager +import sys +import servicemanager +import win32serviceutil from pipeTestService import TestPipeService diff --git a/win32/Demos/service/pipeTestService.py b/win32/Demos/service/pipeTestService.py index 9030f81345..2efda60647 100644 --- a/win32/Demos/service/pipeTestService.py +++ b/win32/Demos/service/pipeTestService.py @@ -8,24 +8,26 @@ # * Start the service. # * Run the "pipeTestServiceClient.py" program as the client pipe side. -import win32serviceutil, win32service -import pywintypes, win32con, winerror - -# Use "import *" to keep this looking as much as a "normal" service -# as possible. Real code shouldn't do this. -from win32event import * -from win32file import * -from win32pipe import * -from win32api import * -from ntsecuritycon import * +import _thread +import traceback # Old versions of the service framework would not let you import this # module at the top-level. Now you can, and can check 'Debugging()' and # 'RunningAsService()' to check your context. +import pywintypes import servicemanager +import win32con +import win32service +import win32serviceutil +import winerror +from ntsecuritycon import * +from win32api import * -import traceback -import _thread +# Use "import *" to keep this looking as much as a "normal" service +# as possible. Real code shouldn't do this. +from win32event import * +from win32file import * +from win32pipe import * def ApplyIgnoreError(fn, args): diff --git a/win32/Demos/service/pipeTestServiceClient.py b/win32/Demos/service/pipeTestServiceClient.py index 7d6295faf8..98fdb3c960 100644 --- a/win32/Demos/service/pipeTestServiceClient.py +++ b/win32/Demos/service/pipeTestServiceClient.py @@ -6,13 +6,16 @@ # Eg: pipeTestServiceClient.py -s server_name Hi There # Should work. -from win32pipe import * -from win32file import * -from win32event import * +import os +import sys +import traceback + import pywintypes import win32api import winerror -import sys, os, traceback +from win32event import * +from win32file import * +from win32pipe import * verbose = 0 @@ -107,7 +110,8 @@ def stressTestClient(server, numThreads, numMessages): def main(): - import sys, getopt + import getopt + import sys server = "." thread_count = 0 diff --git a/win32/Demos/service/serviceEvents.py b/win32/Demos/service/serviceEvents.py index 6dc43f36a9..a62784f954 100644 --- a/win32/Demos/service/serviceEvents.py +++ b/win32/Demos/service/serviceEvents.py @@ -9,12 +9,14 @@ # changes and hardware profile events - so try putting your computer to # sleep and waking it, inserting a memory stick, etc then check the event log -import win32serviceutil, win32service -import win32event -import servicemanager - # Most event notification support lives around win32gui -import win32gui, win32gui_struct, win32con +import servicemanager +import win32con +import win32event +import win32gui +import win32gui_struct +import win32service +import win32serviceutil GUID_DEVINTERFACE_USB_DEVICE = "{A5DCBF10-6530-11D2-901F-00C04FB951ED}" diff --git a/win32/Demos/timer_demo.py b/win32/Demos/timer_demo.py index 55eee925cf..61115f0655 100644 --- a/win32/Demos/timer_demo.py +++ b/win32/Demos/timer_demo.py @@ -4,12 +4,13 @@ # This module, and the timer.pyd core timer support, were written by # Sam Rushing (rushing@nightmare.com) -import timer import time # Timers are based on Windows messages. So we need # to do the event-loop thing! -import win32event, win32gui +import timer +import win32event +import win32gui # glork holds a simple counter for us. diff --git a/win32/Demos/win32clipboardDemo.py b/win32/Demos/win32clipboardDemo.py index f2e7e57061..1252ff7d59 100644 --- a/win32/Demos/win32clipboardDemo.py +++ b/win32/Demos/win32clipboardDemo.py @@ -1,10 +1,10 @@ # win32clipboardDemo.py # # Demo/test of the win32clipboard module. -from win32clipboard import * -from pywin32_testutil import str2bytes # py3k-friendly helper + import win32con -import types +from pywin32_testutil import str2bytes # py3k-friendly helper +from win32clipboard import * if not __debug__: print("WARNING: The test code in this module uses assert") diff --git a/win32/Demos/win32clipboard_bitmapdemo.py b/win32/Demos/win32clipboard_bitmapdemo.py index b6e17c7fea..7d453025fb 100644 --- a/win32/Demos/win32clipboard_bitmapdemo.py +++ b/win32/Demos/win32clipboard_bitmapdemo.py @@ -1,8 +1,7 @@ -import win32gui import win32api import win32clipboard import win32con -import time +import win32gui class ViewerWindow: diff --git a/win32/Demos/win32comport_demo.py b/win32/Demos/win32comport_demo.py index 60a9231770..c0be23917e 100644 --- a/win32/Demos/win32comport_demo.py +++ b/win32/Demos/win32comport_demo.py @@ -13,13 +13,13 @@ # in this sample, the very next thing we do _is_ block - so it shows off the concepts even though it # doesnt exploit them. -from win32file import * # The base COM port and file IO functions. -from win32event import * # We use events and the WaitFor[Multiple]Objects functions. -import win32con # constants. import msvcrt # For the getch() function. - -import threading import sys +import threading + +import win32con # constants. +from win32event import * # We use events and the WaitFor[Multiple]Objects functions. +from win32file import * # The base COM port and file IO functions. def FindModem(): diff --git a/win32/Demos/win32console_demo.py b/win32/Demos/win32console_demo.py index fa526019d1..bb9162bff5 100644 --- a/win32/Demos/win32console_demo.py +++ b/win32/Demos/win32console_demo.py @@ -1,5 +1,7 @@ -import win32console, win32con -import traceback, time +import time + +import win32con +import win32console virtual_keys = {} for k, v in list(win32con.__dict__.items()): diff --git a/win32/Demos/win32cred_demo.py b/win32/Demos/win32cred_demo.py index a22235f0c7..3b49ca7c8f 100644 --- a/win32/Demos/win32cred_demo.py +++ b/win32/Demos/win32cred_demo.py @@ -3,8 +3,12 @@ Also shows how to load user's profile """ -import win32net, win32security, win32api, win32con -import win32profile, win32cred +import win32api +import win32con +import win32cred +import win32net +import win32profile +import win32security ## Prompt for a username/pwd for local computer uiinfo = { diff --git a/win32/Demos/win32fileDemo.py b/win32/Demos/win32fileDemo.py index 6cce4a78d9..a80999251a 100644 --- a/win32/Demos/win32fileDemo.py +++ b/win32/Demos/win32fileDemo.py @@ -1,10 +1,13 @@ # This is a "demo" of win32file - it used to be more a test case than a # demo, so has been moved to the test directory. -# Please contribute your favourite simple little demo. -import win32file, win32api, win32con import os +# Please contribute your favourite simple little demo. +import win32api +import win32con +import win32file + # A very simple demo - note that this does no more than you can do with # builtin Python file objects, so for something as simple as this, you diff --git a/win32/Demos/win32gui_demo.py b/win32/Demos/win32gui_demo.py index 2e44619286..41844a929c 100644 --- a/win32/Demos/win32gui_demo.py +++ b/win32/Demos/win32gui_demo.py @@ -1,8 +1,13 @@ # The start of a win32gui generic demo. # Feel free to contribute more demos back ;-) -import win32gui, win32con, win32api -import time, math, random +import math +import random +import time + +import win32api +import win32con +import win32gui def _MyCallback(hwnd, extra): diff --git a/win32/Demos/win32gui_devicenotify.py b/win32/Demos/win32gui_devicenotify.py index e9ff114f4e..34ad8a259c 100644 --- a/win32/Demos/win32gui_devicenotify.py +++ b/win32/Demos/win32gui_devicenotify.py @@ -1,9 +1,15 @@ # Demo RegisterDeviceNotification etc. Creates a hidden window to receive # notifications. See serviceEvents.py for an example of a service doing # that. -import sys, time -import win32gui, win32con, win32api, win32file -import win32gui_struct, winnt +import sys +import time + +import win32api +import win32con +import win32file +import win32gui +import win32gui_struct +import winnt # These device GUIDs are from Ioevent.h in the Windows SDK. Ideally they # could be collected somewhere for pywin32... diff --git a/win32/Demos/win32gui_dialog.py b/win32/Demos/win32gui_dialog.py index 8db06d8ead..e3b89ba9d3 100644 --- a/win32/Demos/win32gui_dialog.py +++ b/win32/Demos/win32gui_dialog.py @@ -20,13 +20,17 @@ import win32gui else: import winxpgui as win32gui -import win32gui_struct -import win32api -import win32con, winerror -import struct, array -import commctrl -import queue + +import array import os +import queue +import struct + +import commctrl +import win32api +import win32con +import win32gui_struct +import winerror IDC_SEARCHTEXT = 1024 IDC_BUTTON_SEARCH = 1025 diff --git a/win32/Demos/win32gui_menu.py b/win32/Demos/win32gui_menu.py index cea8dfe56b..c462b06227 100644 --- a/win32/Demos/win32gui_menu.py +++ b/win32/Demos/win32gui_menu.py @@ -15,11 +15,14 @@ from winxpgui import * except ImportError: from win32gui import * -from win32gui_struct import * -import win32con -import sys, os -import struct + import array +import os +import struct +import sys + +import win32con +from win32gui_struct import * this_dir = os.path.split(sys.argv[0])[0] diff --git a/win32/Demos/win32gui_taskbar.py b/win32/Demos/win32gui_taskbar.py index 1a17f3a954..84d642a9cd 100644 --- a/win32/Demos/win32gui_taskbar.py +++ b/win32/Demos/win32gui_taskbar.py @@ -1,8 +1,12 @@ # Creates a task-bar icon. Run from Python.exe to see the # messages printed. -import win32api, win32gui -import win32con, winerror -import sys, os +import os +import sys + +import win32api +import win32con +import win32gui +import winerror class MainWindow: diff --git a/win32/Demos/win32netdemo.py b/win32/Demos/win32netdemo.py index 6211853f98..36c495424b 100644 --- a/win32/Demos/win32netdemo.py +++ b/win32/Demos/win32netdemo.py @@ -1,10 +1,11 @@ +import getopt import sys +import traceback + import win32api import win32net import win32netcon import win32security -import getopt -import traceback verbose_level = 0 diff --git a/win32/Demos/win32rcparser_demo.py b/win32/Demos/win32rcparser_demo.py index 4400290b13..6a41d453ac 100644 --- a/win32/Demos/win32rcparser_demo.py +++ b/win32/Demos/win32rcparser_demo.py @@ -1,11 +1,12 @@ # A demo of the win32rcparser module and using win32gui -import win32gui +import os + +import commctrl import win32api import win32con +import win32gui import win32rcparser -import commctrl -import sys, os this_dir = os.path.abspath(os.path.dirname(__file__)) g_rcname = os.path.abspath( diff --git a/win32/Demos/win32servicedemo.py b/win32/Demos/win32servicedemo.py index 1390b768cf..75967ef3ae 100644 --- a/win32/Demos/win32servicedemo.py +++ b/win32/Demos/win32servicedemo.py @@ -1,5 +1,5 @@ -import win32service import win32con +import win32service def EnumServices(): diff --git a/win32/Demos/win32ts_logoff_disconnected.py b/win32/Demos/win32ts_logoff_disconnected.py index a9e935fbfa..be61e5d1f3 100644 --- a/win32/Demos/win32ts_logoff_disconnected.py +++ b/win32/Demos/win32ts_logoff_disconnected.py @@ -1,6 +1,6 @@ """ Finds any disconnected terminal service sessions and logs them off""" -import win32ts import pywintypes +import win32ts import winerror sessions = win32ts.WTSEnumerateSessions(win32ts.WTS_CURRENT_SERVER_HANDLE) diff --git a/win32/Demos/win32wnet/testwnet.py b/win32/Demos/win32wnet/testwnet.py index d5e6f610fd..3b21ac29c4 100644 --- a/win32/Demos/win32wnet/testwnet.py +++ b/win32/Demos/win32wnet/testwnet.py @@ -1,8 +1,8 @@ +import os + import win32api import win32wnet -import sys from winnetwk import * -import os possible_shares = [] diff --git a/win32/Demos/winprocess.py b/win32/Demos/winprocess.py index eb35b1d703..48f6fe7194 100644 --- a/win32/Demos/winprocess.py +++ b/win32/Demos/winprocess.py @@ -14,10 +14,16 @@ -- John B. Dell'Aquila """ -import win32api, win32process, win32security -import win32event, win32con, msvcrt, win32gui +import msvcrt import os +import win32api +import win32con +import win32event +import win32gui +import win32process +import win32security + def logonUser(loginString): """ diff --git a/win32/Lib/netbios.py b/win32/Lib/netbios.py index c9638b25c6..dca4dee679 100644 --- a/win32/Lib/netbios.py +++ b/win32/Lib/netbios.py @@ -1,6 +1,7 @@ +import struct import sys + import win32wnet -import struct # Constants generated by h2py from nb30.h NCBNAMSZ = 16 diff --git a/win32/Lib/pywin32_testutil.py b/win32/Lib/pywin32_testutil.py index 7282de611e..41566a8eb2 100644 --- a/win32/Lib/pywin32_testutil.py +++ b/win32/Lib/pywin32_testutil.py @@ -1,9 +1,10 @@ # Utilities for the pywin32 tests +import gc +import os import site import sys -import os import unittest -import gc + import winerror ## @@ -68,7 +69,7 @@ def countTestCases(self): def __call__(self, result=None): # For the COM suite's sake, always ensure we don't leak # gateways/interfaces - from pythoncom import _GetInterfaceCount, _GetGatewayCount + from pythoncom import _GetGatewayCount, _GetInterfaceCount gc.collect() ni = _GetInterfaceCount() @@ -184,8 +185,8 @@ def loadTestsFromName(self, name, module=None): def check_is_admin(): global _is_admin if _is_admin is None: - from win32com.shell.shell import IsUserAnAdmin import pythoncom + from win32com.shell.shell import IsUserAnAdmin try: _is_admin = IsUserAnAdmin() diff --git a/win32/Lib/pywintypes.py b/win32/Lib/pywintypes.py index 8f03e0d7a2..115c4f82f7 100644 --- a/win32/Lib/pywintypes.py +++ b/win32/Lib/pywintypes.py @@ -1,5 +1,8 @@ # Magic utility that "redirects" to pywintypesxx.dll -import importlib.util, importlib.machinery, sys, os +import importlib.machinery +import importlib.util +import os +import sys def __import_pywin32_system_module__(modname, globs): diff --git a/win32/Lib/regcheck.py b/win32/Lib/regcheck.py index 835c6523b0..c07b77b7a6 100644 --- a/win32/Lib/regcheck.py +++ b/win32/Lib/regcheck.py @@ -8,12 +8,13 @@ category=PendingDeprecationWarning, ) -import win32con -import regutil -import win32api import os import sys +import regutil +import win32api +import win32con + def CheckRegisteredExe(exename): try: diff --git a/win32/Lib/regutil.py b/win32/Lib/regutil.py index 354dcfadda..1abdd551a9 100644 --- a/win32/Lib/regutil.py +++ b/win32/Lib/regutil.py @@ -1,8 +1,9 @@ # Some registry helpers. +import os +import sys + import win32api import win32con -import sys -import os error = "Registry utility error" diff --git a/win32/Lib/sspi.py b/win32/Lib/sspi.py index d1422b182c..22c0e4a0eb 100644 --- a/win32/Lib/sspi.py +++ b/win32/Lib/sspi.py @@ -13,7 +13,8 @@ """ # Based on Roger Upole's sspi demos. # $Id$ -import win32security, sspicon +import sspicon +import win32security error = win32security.error diff --git a/win32/Lib/win32evtlogutil.py b/win32/Lib/win32evtlogutil.py index 6a0a109038..8959c03b2b 100644 --- a/win32/Lib/win32evtlogutil.py +++ b/win32/Lib/win32evtlogutil.py @@ -1,7 +1,10 @@ """Event Log Utilities - helper for win32evtlog.pyd """ -import win32api, win32con, winerror, win32evtlog +import win32api +import win32con +import win32evtlog +import winerror error = win32api.error # The error the evtlog module raises. diff --git a/win32/Lib/win32gui_struct.py b/win32/Lib/win32gui_struct.py index 2c200c6a2f..86623ae323 100644 --- a/win32/Lib/win32gui_struct.py +++ b/win32/Lib/win32gui_struct.py @@ -27,13 +27,14 @@ # win32gui (ie, the Pack* functions) - but doesn't make as much sense for # the Unpack* functions, where the aim is user convenience. -import sys -import win32gui -import win32con -import struct import array +import struct +import sys + import commctrl import pywintypes +import win32con +import win32gui is64bit = "64 bit" in sys.version diff --git a/win32/Lib/win32pdhquery.py b/win32/Lib/win32pdhquery.py index 98e257bf02..a48db08a83 100644 --- a/win32/Lib/win32pdhquery.py +++ b/win32/Lib/win32pdhquery.py @@ -125,7 +125,12 @@ """ # Feb 12, 98 - MH added "rawaddcounter" so caller can get exception details. -import win32pdh, win32api, time, _thread, copy +import _thread +import copy +import time + +import win32api +import win32pdh class BaseQuery: diff --git a/win32/Lib/win32pdhutil.py b/win32/Lib/win32pdhutil.py index 0279c9b1cc..7795dd904e 100644 --- a/win32/Lib/win32pdhutil.py +++ b/win32/Lib/win32pdhutil.py @@ -18,7 +18,9 @@ the easiest way is often to simply use PerfMon to find out the names. """ -import win32pdh, time +import time + +import win32pdh error = win32pdh.error @@ -30,7 +32,8 @@ def find_pdh_counter_localized_name(english_name, machine_name=None): if not counter_english_map: - import win32api, win32con + import win32api + import win32con counter_reg_value = win32api.RegQueryValueEx( win32con.HKEY_PERFORMANCE_DATA, "Counter 009" diff --git a/win32/Lib/win32rcparser.py b/win32/Lib/win32rcparser.py index eae24a030e..effe1429fa 100644 --- a/win32/Lib/win32rcparser.py +++ b/win32/Lib/win32rcparser.py @@ -10,10 +10,14 @@ __author__ = "Adam Walker" __version__ = "0.11" -import sys, os, shlex, stat +import os import pprint -import win32con +import shlex +import stat +import sys + import commctrl +import win32con _controlMap = { "DEFPUSHBUTTON": 0x80, diff --git a/win32/Lib/win32serviceutil.py b/win32/Lib/win32serviceutil.py index 674d969ddf..fb1875302c 100644 --- a/win32/Lib/win32serviceutil.py +++ b/win32/Lib/win32serviceutil.py @@ -6,9 +6,16 @@ # when things go wrong - eg, not enough permissions to hit the # registry etc. -import win32service, win32api, win32con, winerror -import sys, pywintypes, os, warnings import importlib +import os +import sys +import warnings + +import pywintypes +import win32api +import win32con +import win32service +import winerror _d = "_d" if "_d.pyd" in importlib.machinery.EXTENSION_SUFFIXES else "" error = RuntimeError diff --git a/win32/Lib/win32timezone.py b/win32/Lib/win32timezone.py index 95e8ae310d..569ea9b941 100644 --- a/win32/Lib/win32timezone.py +++ b/win32/Lib/win32timezone.py @@ -233,15 +233,15 @@ """ __author__ = "Jason R. Coombs " -import winreg -import struct import datetime -import win32api -import re +import logging import operator +import re +import struct +import winreg from itertools import count -import logging +import win32api log = logging.getLogger(__file__) diff --git a/win32/Lib/win32verstamp.py b/win32/Lib/win32verstamp.py index ce5847d2d0..dea032b0a7 100644 --- a/win32/Lib/win32verstamp.py +++ b/win32/Lib/win32verstamp.py @@ -1,14 +1,13 @@ """ Stamp a Win32 binary with version information. """ -from win32api import BeginUpdateResource, UpdateResource, EndUpdateResource - +import glob +import optparse import os import struct -import glob import sys -import optparse +from win32api import BeginUpdateResource, EndUpdateResource, UpdateResource VS_FFI_SIGNATURE = -17890115 # 0xFEEF04BD VS_FFI_STRUCVERSION = 0x00010000 diff --git a/win32/scripts/ControlService.py b/win32/scripts/ControlService.py index 3db14e1035..d2281add2b 100644 --- a/win32/scripts/ControlService.py +++ b/win32/scripts/ControlService.py @@ -27,10 +27,10 @@ # Right now, we always try to get all the rights and fail when we can't -from pywin.mfc import dialog -import win32ui import win32con import win32service +import win32ui +from pywin.mfc import dialog class StartupDlg(dialog.Dialog): diff --git a/win32/scripts/VersionStamp/BrandProject.py b/win32/scripts/VersionStamp/BrandProject.py index 7a60bc424a..cc78d8d91f 100644 --- a/win32/scripts/VersionStamp/BrandProject.py +++ b/win32/scripts/VersionStamp/BrandProject.py @@ -3,9 +3,13 @@ # Brand a VSS project with a "build number", then optionally # stamp DLL/EXE files with version information. -import win32api, os, string, sys -import vssutil +import os +import string +import sys + import bulkstamp +import vssutil +import win32api def BrandProject( diff --git a/win32/scripts/VersionStamp/bulkstamp.py b/win32/scripts/VersionStamp/bulkstamp.py index 47385865b3..44f2a63e07 100644 --- a/win32/scripts/VersionStamp/bulkstamp.py +++ b/win32/scripts/VersionStamp/bulkstamp.py @@ -30,10 +30,11 @@ # Any line beginning with "#" will be ignored. Empty lines are okay. # -import sys +import fnmatch import os +import sys + import verstamp -import fnmatch import win32api numStamped = 0 diff --git a/win32/scripts/VersionStamp/vssutil.py b/win32/scripts/VersionStamp/vssutil.py index 8dff30d97d..6679ebc930 100644 --- a/win32/scripts/VersionStamp/vssutil.py +++ b/win32/scripts/VersionStamp/vssutil.py @@ -1,8 +1,11 @@ -import win32con, string, traceback -import win32com.client, win32com.client.gencache -import pythoncom +import string import time -import os +import traceback + +import pythoncom +import win32com.client +import win32com.client.gencache +import win32con constants = win32com.client.constants diff --git a/win32/scripts/backupEventLog.py b/win32/scripts/backupEventLog.py index f3d178db33..bc7d53fec5 100644 --- a/win32/scripts/backupEventLog.py +++ b/win32/scripts/backupEventLog.py @@ -1,5 +1,7 @@ # Generate a base file name -import time, os +import os +import time + import win32api import win32evtlog diff --git a/win32/scripts/ce/pysynch.py b/win32/scripts/ce/pysynch.py index 6156ca77fa..7a44e08222 100644 --- a/win32/scripts/ce/pysynch.py +++ b/win32/scripts/ce/pysynch.py @@ -1,14 +1,15 @@ # Simple CE synchronisation utility with Python features. -import wincerapi -import win32api -import win32file +import fnmatch import getopt -import sys import os import string +import sys + +import win32api import win32con -import fnmatch +import win32file +import wincerapi class InvalidUsage(Exception): @@ -112,7 +113,8 @@ def _copyfilter(full_name, rel_name, info, local, bMaintainDir): return os.path.split(rel_name)[1] -import pywin.dialogs.status, win32ui +import pywin.dialogs.status +import win32ui class FileCopyProgressDialog(pywin.dialogs.status.CStatusProgressDialog): diff --git a/win32/scripts/killProcName.py b/win32/scripts/killProcName.py index 2ff98c78b3..c9b399ff8b 100644 --- a/win32/scripts/killProcName.py +++ b/win32/scripts/killProcName.py @@ -11,7 +11,11 @@ # to get all sorts of information about a running process and many # other aspects of your system. -import win32api, win32pdhutil, win32con, sys +import sys + +import win32api +import win32con +import win32pdhutil def killProcName(procname): diff --git a/win32/scripts/rasutil.py b/win32/scripts/rasutil.py index bd2c0d5e15..e5a8922d72 100644 --- a/win32/scripts/rasutil.py +++ b/win32/scripts/rasutil.py @@ -1,5 +1,6 @@ # A demo of using the RAS API from Python import sys + import win32ras diff --git a/win32/scripts/regsetup.py b/win32/scripts/regsetup.py index afe3bb8a23..885698e1f2 100644 --- a/win32/scripts/regsetup.py +++ b/win32/scripts/regsetup.py @@ -48,7 +48,9 @@ def FindPackagePath(packageName, knownFileName, searchPaths): First place looked is the registry for an existing entry. Then the searchPaths are searched. """ - import regutil, os + import os + + import regutil pathLook = regutil.GetRegisteredNamedPath(packageName) if pathLook and IsPackageDir(pathLook, packageName, knownFileName): @@ -64,7 +66,10 @@ def FindPackagePath(packageName, knownFileName, searchPaths): def FindHelpPath(helpFile, helpDesc, searchPaths): # See if the current registry entry is OK - import os, win32api, win32con + import os + + import win32api + import win32con try: key = win32api.RegOpenKey( @@ -100,7 +105,9 @@ def FindAppPath(appName, knownFileName, searchPaths): the searchPaths are searched. """ # Look in the first path. - import regutil, string, os + import os + + import regutil regPath = regutil.GetRegisteredNamedPath(appName) if regPath: @@ -124,7 +131,11 @@ def FindPythonExe(exeAlias, possibleRealNames, searchPaths): registered entry is OK. We don't trust the already registered version even if it exists - it may be wrong (ie, for a different Python version) """ - import win32api, regutil, string, os, sys + import os + import sys + + import regutil + import win32api if possibleRealNames is None: possibleRealNames = exeAlias @@ -151,7 +162,8 @@ def FindPythonExe(exeAlias, possibleRealNames, searchPaths): def QuotedFileName(fname): """Given a filename, return a quoted version if necessary""" - import regutil, string + + import regutil try: fname.index(" ") # Other chars forcing quote? @@ -169,7 +181,9 @@ def LocateFileName(fileNamesString, searchPaths): Raises KeyboardInterrupt if the user cancels. """ - import regutil, string, os + import os + + import regutil fileNames = fileNamesString.split(";") for path in searchPaths: @@ -185,7 +199,8 @@ def LocateFileName(fileNamesString, searchPaths): else: fileName = fileNames[0] try: - import win32ui, win32con + import win32con + import win32ui except ImportError: raise error( "Need to locate the file %s, but the win32ui module is not available\nPlease run the program again, passing as a parameter the path to this file." @@ -231,7 +246,9 @@ def LocatePythonCore(searchPaths): of paths that should be used as the core (ie, un-named) portion of the Python path. """ - import os, regutil + import os + + import regutil currentPath = regutil.GetRegisteredNamedPath(None) if currentPath: @@ -273,7 +290,8 @@ def FindRegisterPackage(packageName, knownFile, searchPaths, registryAppName=Non (no other paths are checked, as the application whose path was used may later be uninstalled. This should not happen with the core) """ - import regutil, string + + import regutil if not packageName: raise error("A package name must be supplied") @@ -307,7 +325,8 @@ def FindRegisterApp(appName, knownFiles, searchPaths): Assumes the core registry setup correctly. """ - import regutil, string + + import regutil if type(knownFiles) == type(""): knownFiles = [knownFiles] @@ -329,7 +348,8 @@ def FindRegisterPythonExe(exeAlias, searchPaths, actualFileNames=None): Assumes the core registry setup correctly. """ - import regutil, string + + import regutil fname, ok = FindPythonExe(exeAlias, actualFileNames, searchPaths) if not ok: @@ -364,7 +384,10 @@ def SetupCore(searchPaths): sys.path.append(path) import os - import regutil, win32api, win32con + + import regutil + import win32api + import win32con installPath, corePaths = LocatePythonCore(searchPaths) # Register the core Pythonpath. @@ -405,7 +428,8 @@ def RegisterShellInfo(searchPaths): Assumes a valid, minimal Python installation exists (ie, SetupCore() has been previously successfully run) """ - import regutil, win32con + import regutil + import win32con suffix = IsDebug() # Set up a pointer to the .exe's @@ -537,7 +561,7 @@ def RegisterShellInfo(searchPaths): regcheck.CheckRegistry() else: searchPaths = [] - import getopt, string + import getopt opts, args = getopt.getopt( sys.argv[1:], @@ -571,7 +595,8 @@ def RegisterShellInfo(searchPaths): if o == "-c": if not len(searchPaths): raise error("-c option must provide at least one additional path") - import win32api, regutil + import regutil + import win32api currentPaths = regutil.GetRegisteredNamedPath(None).split(";") oldLen = len(currentPaths) diff --git a/win32/scripts/setup_d.py b/win32/scripts/setup_d.py index 93ed037dbe..babd835967 100644 --- a/win32/scripts/setup_d.py +++ b/win32/scripts/setup_d.py @@ -3,11 +3,12 @@ # Assumes the _d files can be found in the same directory as this script # or in the cwd. -import win32api -import winreg -import sys -import shutil import os +import shutil +import sys +import winreg + +import win32api def usage_and_die(rc): diff --git a/win32/test/handles.py b/win32/test/handles.py index a5bc23de5d..ad607353e8 100644 --- a/win32/test/handles.py +++ b/win32/test/handles.py @@ -1,5 +1,6 @@ import sys import unittest + import pywintypes import win32api diff --git a/win32/test/test_clipboard.py b/win32/test/test_clipboard.py index ca507b29d3..843435b6a8 100644 --- a/win32/test/test_clipboard.py +++ b/win32/test/test_clipboard.py @@ -1,13 +1,14 @@ # General test module for win32api - please add some :) -import sys, os +import array +import os +import sys import unittest -from win32clipboard import * -import win32gui, win32con import pywintypes -import array - +import win32con +import win32gui from pywin32_testutil import str2bytes +from win32clipboard import * custom_format_name = "PythonClipboardTestFormat" diff --git a/win32/test/test_exceptions.py b/win32/test/test_exceptions.py index 946a04b19e..331011073b 100644 --- a/win32/test/test_exceptions.py +++ b/win32/test/test_exceptions.py @@ -1,8 +1,11 @@ """Test pywin32's error semantics""" import sys import unittest -import win32api, win32file, pywintypes + import pythoncom +import pywintypes +import win32api +import win32file import winerror diff --git a/win32/test/test_odbc.py b/win32/test/test_odbc.py index cf34169ff9..ef2b45167c 100644 --- a/win32/test/test_odbc.py +++ b/win32/test/test_odbc.py @@ -1,16 +1,16 @@ # odbc test suite kindly contributed by Frank Millman. -import sys import os -import unittest -import odbc +import sys import tempfile +import unittest -from pywin32_testutil import str2bytes, str2memory, TestSkipped +import odbc +import pythoncom +from pywin32_testutil import TestSkipped, str2bytes, str2memory +from win32com.client import constants # We use the DAO ODBC driver from win32com.client.gencache import EnsureDispatch -from win32com.client import constants -import pythoncom class TestStuff(unittest.TestCase): diff --git a/win32/test/test_pywintypes.py b/win32/test/test_pywintypes.py index f8a16d757f..bbd9d8823d 100644 --- a/win32/test/test_pywintypes.py +++ b/win32/test/test_pywintypes.py @@ -1,10 +1,11 @@ +import datetime +import operator import sys +import time import unittest + import pywintypes -import time -from pywin32_testutil import str2bytes, ob2memory -import datetime -import operator +from pywin32_testutil import ob2memory, str2bytes class TestCase(unittest.TestCase): diff --git a/win32/test/test_security.py b/win32/test/test_security.py index 038f9ecf2d..42a82a134d 100644 --- a/win32/test/test_security.py +++ b/win32/test/test_security.py @@ -1,10 +1,13 @@ # Tests for the win32security module. -import sys, os import unittest -import winerror -from pywin32_testutil import testmain, TestSkipped, ob2memory -import win32api, win32con, win32security, ntsecuritycon, pywintypes +import ntsecuritycon +import pywintypes +import win32api +import win32con +import win32security +import winerror +from pywin32_testutil import TestSkipped, ob2memory, testmain class SecurityTests(unittest.TestCase): diff --git a/win32/test/test_sspi.py b/win32/test/test_sspi.py index 3d15889bf9..5d349d4d30 100644 --- a/win32/test/test_sspi.py +++ b/win32/test/test_sspi.py @@ -2,10 +2,14 @@ # Stolen from Roger's original test_sspi.c, a version of which is in "Demos" # See also the other SSPI demos. import re -import win32security, sspi, sspicon, win32api -from pywin32_testutil import TestSkipped, testmain, str2bytes import unittest +import sspi +import sspicon +import win32api +import win32security +from pywin32_testutil import TestSkipped, str2bytes, testmain + # It is quite likely that the Kerberos tests will fail due to not being # installed. The NTLM tests do *not* get the same behaviour as they should diff --git a/win32/test/test_win32api.py b/win32/test/test_win32api.py index ac34c4a76e..58ac15978a 100644 --- a/win32/test/test_win32api.py +++ b/win32/test/test_win32api.py @@ -1,12 +1,16 @@ # General test module for win32api - please add some :) +import datetime +import os +import sys +import tempfile import unittest -from pywin32_testutil import str2bytes, TestSkipped -import win32api, win32con, win32event, winerror -import sys, os -import tempfile -import datetime +import win32api +import win32con +import win32event +import winerror +from pywin32_testutil import TestSkipped, str2bytes class CurrentUserTestCase(unittest.TestCase): diff --git a/win32/test/test_win32crypt.py b/win32/test/test_win32crypt.py index 670b75c8c2..4d1fa712e4 100644 --- a/win32/test/test_win32crypt.py +++ b/win32/test/test_win32crypt.py @@ -1,14 +1,12 @@ # Test module for win32crypt -import unittest -import logging import contextlib -from typing import Iterator, Any +import unittest +from typing import Any, Iterator import win32crypt -from win32con import * +from pywin32_testutil import TestSkipped, find_test_fixture, testmain from win32cryptcon import * -from pywin32_testutil import find_test_fixture, testmain, TestSkipped class Crypt(unittest.TestCase): diff --git a/win32/test/test_win32event.py b/win32/test/test_win32event.py index 0d6ea2f1cf..9e6efa3f8a 100644 --- a/win32/test/test_win32event.py +++ b/win32/test/test_win32event.py @@ -1,9 +1,7 @@ import unittest -import win32event + import pywintypes -import time -import os -import sys +import win32event class TestWaitableTimer(unittest.TestCase): diff --git a/win32/test/test_win32file.py b/win32/test/test_win32file.py index 99c01d43cd..da99803278 100644 --- a/win32/test/test_win32file.py +++ b/win32/test/test_win32file.py @@ -1,17 +1,23 @@ -import unittest -from pywin32_testutil import str2bytes, TestSkipped, testmain -import win32api, win32file, win32pipe, pywintypes, winerror, win32event -import win32con, ntsecuritycon -import sys +import datetime import os +import random +import shutil +import socket import tempfile import threading import time -import shutil -import socket -import datetime -import random +import unittest + +import ntsecuritycon +import pywintypes +import win32api +import win32con +import win32event +import win32file +import win32pipe import win32timezone +import winerror +from pywin32_testutil import TestSkipped, str2bytes, testmain try: set diff --git a/win32/test/test_win32gui.py b/win32/test/test_win32gui.py index 6677eac92b..ad96bd4352 100644 --- a/win32/test/test_win32gui.py +++ b/win32/test/test_win32gui.py @@ -1,10 +1,10 @@ # tests for win32gui +import array +import operator import unittest -import win32gui + import pywin32_testutil -import operator -import array -import sys +import win32gui class TestPyGetString(unittest.TestCase): diff --git a/win32/test/test_win32guistruct.py b/win32/test/test_win32guistruct.py index 805921a3b2..063cea3a7f 100644 --- a/win32/test/test_win32guistruct.py +++ b/win32/test/test_win32guistruct.py @@ -1,9 +1,10 @@ +import array import unittest + +import pythoncom +import win32con import win32gui import win32gui_struct -import win32con -import array -import pythoncom class TestBase(unittest.TestCase): diff --git a/win32/test/test_win32inet.py b/win32/test/test_win32inet.py index 837e56d5b2..044ef8e612 100644 --- a/win32/test/test_win32inet.py +++ b/win32/test/test_win32inet.py @@ -1,11 +1,10 @@ -from win32inet import * -from win32inetcon import * +import unittest + import winerror from pywin32_testutil import str2bytes # py3k-friendly helper -from pywin32_testutil import TestSkipped -from pywin32_testutil import testmain - -import unittest +from pywin32_testutil import TestSkipped, testmain +from win32inet import * +from win32inetcon import * class CookieTests(unittest.TestCase): diff --git a/win32/test/test_win32net.py b/win32/test/test_win32net.py index 5e3656dcdd..9307196333 100644 --- a/win32/test/test_win32net.py +++ b/win32/test/test_win32net.py @@ -1,5 +1,7 @@ import unittest -import win32net, win32netcon + +import win32net +import win32netcon class TestCase(unittest.TestCase): diff --git a/win32/test/test_win32pipe.py b/win32/test/test_win32pipe.py index 4dfb8e8080..cbe647dde7 100644 --- a/win32/test/test_win32pipe.py +++ b/win32/test/test_win32pipe.py @@ -1,15 +1,14 @@ -import unittest -import time import threading -from pywin32_testutil import str2bytes # py3k-friendly helper - +import time +import unittest -import win32pipe -import win32file -import win32event import pywintypes -import winerror import win32con +import win32event +import win32file +import win32pipe +import winerror +from pywin32_testutil import str2bytes # py3k-friendly helper class PipeTests(unittest.TestCase): diff --git a/win32/test/test_win32print.py b/win32/test/test_win32print.py index 6b99058608..71fd2c038b 100644 --- a/win32/test/test_win32print.py +++ b/win32/test/test_win32print.py @@ -1,6 +1,5 @@ # Tests (scarce) for win32print module -import os import unittest import win32print as wprn diff --git a/win32/test/test_win32profile.py b/win32/test/test_win32profile.py index 4f10cb36e9..84dc83bc9d 100644 --- a/win32/test/test_win32profile.py +++ b/win32/test/test_win32profile.py @@ -1,6 +1,7 @@ """Test win32profile""" import os import unittest + import win32profile diff --git a/win32/test/test_win32rcparser.py b/win32/test/test_win32rcparser.py index 25cbc45445..6eae6884c8 100644 --- a/win32/test/test_win32rcparser.py +++ b/win32/test/test_win32rcparser.py @@ -1,8 +1,9 @@ -import sys, os +import os +import tempfile import unittest -import win32rcparser + import win32con -import tempfile +import win32rcparser class TestParser(unittest.TestCase): diff --git a/win32/test/test_win32timezone.py b/win32/test/test_win32timezone.py index 98de2d1191..6dba51edc9 100644 --- a/win32/test/test_win32timezone.py +++ b/win32/test/test_win32timezone.py @@ -1,9 +1,10 @@ # Test module for win32timezone +import doctest import sys import unittest + import win32timezone -import doctest class Win32TimeZoneTest(unittest.TestCase): diff --git a/win32/test/test_win32trace.py b/win32/test/test_win32trace.py index 4d5b8d5830..8b241cbbd6 100644 --- a/win32/test/test_win32trace.py +++ b/win32/test/test_win32trace.py @@ -1,9 +1,10 @@ -import unittest -import win32trace -import threading -import time import os import sys +import threading +import time +import unittest + +import win32trace from pywin32_testutil import TestSkipped if __name__ == "__main__": diff --git a/win32/test/test_win32wnet.py b/win32/test/test_win32wnet.py index 2b3bc78e8b..04ad8a4de0 100644 --- a/win32/test/test_win32wnet.py +++ b/win32/test/test_win32wnet.py @@ -1,8 +1,8 @@ import unittest -import win32wnet -import win32api -import netbios +import netbios +import win32api +import win32wnet from pywin32_testutil import str2bytes RESOURCE_CONNECTED = 0x00000001 diff --git a/win32/test/testall.py b/win32/test/testall.py index 179c27467c..d3df263018 100644 --- a/win32/test/testall.py +++ b/win32/test/testall.py @@ -1,7 +1,9 @@ -import sys, os +import os import re -import unittest +import sys import traceback +import unittest + import pywin32_testutil # A list of demos that depend on user-interface of *any* kind. Tests listed