from pywin.mfc

Avasam · Sep 22, 2023 · 4924917 · 4924917
1 parent 2a1aeae
commit 4924917
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/Pythonwin/pywin/Demos/dyndlg.py b/Pythonwin/pywin/Demos/dyndlg.py
@@ -21,7 +21,7 @@
 
 import win32con
 import win32ui
-from pywin.mfc import dialog, window
+from pywin.mfc import dialog
 
 
 def MakeDlgTemplate():

diff --git a/Pythonwin/pywin/Demos/ocx/msoffice.py b/Pythonwin/pywin/Demos/ocx/msoffice.py
@@ -4,11 +4,10 @@
 # It is not comlpete yet, but it _does_ show an Excel spreadsheet in a frame!
 #
 
-import regutil
 import win32con
 import win32ui
 import win32uiole
-from pywin.mfc import activex, docview, object, window
+from pywin.mfc import docview, object, window
 from win32com.client import gencache
 
 # WordModule = gencache.EnsureModule('{00020905-0000-0000-C000-000000000046}', 1033, 8, 0)

diff --git a/Pythonwin/pywin/Demos/threadedgui.py b/Pythonwin/pywin/Demos/threadedgui.py
@@ -6,7 +6,7 @@
 import win32api
 import win32con
 import win32ui
-from pywin.mfc import docview, thread, window
+from pywin.mfc import window
 from pywin.mfc.thread import WinThread
 
 WM_USER_PREPARE_TO_CLOSE = win32con.WM_USER + 32

diff --git a/Pythonwin/pywin/debugger/debugger.py b/Pythonwin/pywin/debugger/debugger.py
@@ -23,7 +23,7 @@
 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.mfc import afxres, window
 from pywin.tools import browser, hierlist
 
 from .dbgcon import *

diff --git a/Pythonwin/pywin/docking/DockingBar.py b/Pythonwin/pywin/docking/DockingBar.py
@@ -658,8 +658,6 @@ def EditCreator(parent):
 
 
 def test():
-    import pywin.mfc.dialog
-
     global bar
     bar = DockingBar()
     creator = EditCreator

diff --git a/Pythonwin/pywin/scintilla/view.py b/Pythonwin/pywin/scintilla/view.py
@@ -1,6 +1,5 @@
 # A general purpose MFC CCtrlView view that uses Scintilla.
 
-import array
 import os
 import re
 import string
@@ -11,10 +10,10 @@
 import afxres
 import win32con
 import win32ui
-from pywin.mfc import dialog, docview
+from pywin.mfc import docview
 
 from . import IDLEenvironment  # IDLE emulation.
-from . import bindings, control, keycodes, scintillacon
+from . import bindings, control, scintillacon
 
 PRINTDLGORD = 1538
 IDC_PRINT_MAG_EDIT = 1010

diff --git a/Pythonwin/pywin/tools/hierlist.py b/Pythonwin/pywin/tools/hierlist.py
@@ -18,7 +18,7 @@
 import win32api
 import win32con
 import win32ui
-from pywin.mfc import dialog, docview, object, window
+from pywin.mfc import dialog, object
 from win32api import RGB
 
 

diff --git a/Pythonwin/pywin/tools/regedit.py b/Pythonwin/pywin/tools/regedit.py
@@ -128,8 +128,6 @@ def OnDeleteKey(self, command, code):
             self.hierList.Refresh(hparent)
 
     def OnAddKey(self, command, code):
-        from pywin.mfc import dialog
-
         val = dialog.GetSimpleInput("New key name", "", "Add new key")
         if val is None:
             return  # cancelled.
@@ -139,8 +137,6 @@ def OnAddKey(self, command, code):
             self.hierList.Refresh(hitem)
 
     def OnAddValue(self, command, code):
-        from pywin.mfc import dialog
-
         val = dialog.GetSimpleInput("New value", "", "Add new value")
         if val is None:
             return  # cancelled.

diff --git a/Pythonwin/pywin/tools/regpy.py b/Pythonwin/pywin/tools/regpy.py
@@ -1,8 +1,8 @@
 # (sort-of) Registry editor
 import commctrl
+import dialog
 import win32con
 import win32ui
-from pywin.mfc import dialog
 
 
 class RegistryControl: