Skip to content

Commit

Permalink
deduplicate afxres (#2177)
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam authored Mar 14, 2024
1 parent 1ba696d commit e0fda45
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 507 deletions.
2 changes: 1 addition & 1 deletion Pythonwin/pywin/framework/editor/ModuleBrowser.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# ModuleBrowser.py - A view that provides a module browser for an editor document.
import pyclbr

import afxres
import commctrl
import pywin.framework.scriptutils
import pywin.mfc.docview
import win32api
import win32con
import win32ui
from pywin.mfc import afxres
from pywin.tools import browser, hierlist


Expand Down
2 changes: 1 addition & 1 deletion Pythonwin/pywin/framework/interact.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import traceback

import __main__
import afxres
import pywin.framework.app
import pywin.scintilla.control
import pywin.scintilla.formatter
Expand All @@ -20,6 +19,7 @@
import win32clipboard
import win32con
import win32ui
from pywin.mfc import afxres

## sequential after ID_GOTO_LINE defined in editor.py
ID_EDIT_COPY_CODE = 0xE2002
Expand Down
3 changes: 1 addition & 2 deletions Pythonwin/pywin/scintilla/find.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# find.py - Find and Replace
from __future__ import annotations

import afxres
import win32api
import win32con
import win32ui
from pywin.framework import scriptutils
from pywin.mfc import dialog
from pywin.mfc import afxres, dialog

FOUND_NOTHING = 0
FOUND_NORMAL = 1
Expand Down
3 changes: 1 addition & 2 deletions Pythonwin/pywin/scintilla/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
import sys

import __main__ # for attribute lookup
import afxres
import win32con
import win32ui
from pywin.mfc import docview
from pywin.mfc import afxres, docview

from . import IDLEenvironment # IDLE emulation.
from . import bindings, control, scintillacon
Expand Down
3 changes: 1 addition & 2 deletions Pythonwin/pywin/tools/browseProjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
import os
import pyclbr

import afxres
import commctrl
import pywin.framework.scriptutils
import regutil
import win32api
import win32con
import win32ui
from pywin.mfc import dialog
from pywin.mfc import afxres, dialog

from . import hierlist

Expand Down
Loading

0 comments on commit e0fda45

Please sign in to comment.