Skip to content

Commit e0fda45

Browse files
authored
deduplicate afxres (#2177)
1 parent 1ba696d commit e0fda45

File tree

6 files changed

+11
-507
lines changed

6 files changed

+11
-507
lines changed

Pythonwin/pywin/framework/editor/ModuleBrowser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# ModuleBrowser.py - A view that provides a module browser for an editor document.
22
import pyclbr
33

4-
import afxres
54
import commctrl
65
import pywin.framework.scriptutils
76
import pywin.mfc.docview
87
import win32api
98
import win32con
109
import win32ui
10+
from pywin.mfc import afxres
1111
from pywin.tools import browser, hierlist
1212

1313

Pythonwin/pywin/framework/interact.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import traceback
1212

1313
import __main__
14-
import afxres
1514
import pywin.framework.app
1615
import pywin.scintilla.control
1716
import pywin.scintilla.formatter
@@ -20,6 +19,7 @@
2019
import win32clipboard
2120
import win32con
2221
import win32ui
22+
from pywin.mfc import afxres
2323

2424
## sequential after ID_GOTO_LINE defined in editor.py
2525
ID_EDIT_COPY_CODE = 0xE2002

Pythonwin/pywin/scintilla/find.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# find.py - Find and Replace
22
from __future__ import annotations
33

4-
import afxres
54
import win32api
65
import win32con
76
import win32ui
87
from pywin.framework import scriptutils
9-
from pywin.mfc import dialog
8+
from pywin.mfc import afxres, dialog
109

1110
FOUND_NOTHING = 0
1211
FOUND_NORMAL = 1

Pythonwin/pywin/scintilla/view.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import sys
88

99
import __main__ # for attribute lookup
10-
import afxres
1110
import win32con
1211
import win32ui
13-
from pywin.mfc import docview
12+
from pywin.mfc import afxres, docview
1413

1514
from . import IDLEenvironment # IDLE emulation.
1615
from . import bindings, control, scintillacon

Pythonwin/pywin/tools/browseProjects.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
import os
33
import pyclbr
44

5-
import afxres
65
import commctrl
76
import pywin.framework.scriptutils
87
import regutil
98
import win32api
109
import win32con
1110
import win32ui
12-
from pywin.mfc import dialog
11+
from pywin.mfc import afxres, dialog
1312

1413
from . import hierlist
1514

0 commit comments

Comments
 (0)