diff --git a/angrmanagement/plugins/precise_diffing/function_diff.py b/angrmanagement/plugins/precise_diffing/function_diff.py index 2f72eea54..0da23eb85 100644 --- a/angrmanagement/plugins/precise_diffing/function_diff.py +++ b/angrmanagement/plugins/precise_diffing/function_diff.py @@ -3,13 +3,12 @@ from typing import List, Union import networkx as nx - -from angr.analyses.disassembly import MemoryOperand -from angr.knowledge_plugins.functions.function import Function +from angr.analyses.disassembly import Disassembly, Instruction, MemoryOperand from angr.block import CapstoneInsn -from angr.analyses.disassembly import Disassembly, Instruction -from angrmanagement.utils import string_at_addr +from angr.knowledge_plugins.functions.function import Function + from angrmanagement.ui.views import DisassemblyView +from angrmanagement.utils import string_at_addr class FunctionDiff: diff --git a/angrmanagement/plugins/precise_diffing/precisediff_plugin.py b/angrmanagement/plugins/precise_diffing/precisediff_plugin.py index 80052c5a9..3f2d24f83 100644 --- a/angrmanagement/plugins/precise_diffing/precisediff_plugin.py +++ b/angrmanagement/plugins/precise_diffing/precisediff_plugin.py @@ -1,17 +1,17 @@ import logging -from typing import Optional from pathlib import Path +from typing import Optional import angr from PySide6.QtGui import QColor from PySide6.QtWidgets import QFileDialog -from angrmanagement.plugins import BasePlugin from angrmanagement.data.instance import Instance +from angrmanagement.plugins import BasePlugin from angrmanagement.ui.views import DisassemblyView from .diff_view import DiffDisassemblyView -from .function_diff import FunctionDiff, BFSFunctionDiff +from .function_diff import BFSFunctionDiff, FunctionDiff from .settings_dialog import SettingsDialog logger = logging.getLogger(__name__) diff --git a/angrmanagement/plugins/precise_diffing/settings_dialog.py b/angrmanagement/plugins/precise_diffing/settings_dialog.py index 139bf2541..9547c6956 100644 --- a/angrmanagement/plugins/precise_diffing/settings_dialog.py +++ b/angrmanagement/plugins/precise_diffing/settings_dialog.py @@ -1,18 +1,18 @@ from PySide6.QtGui import QColor from PySide6.QtWidgets import ( + QCheckBox, QDialog, - QVBoxLayout, + QGridLayout, QGroupBox, - QRadioButton, - QPushButton, QHBoxLayout, - QCheckBox, - QGridLayout, - QLineEdit, QLabel, + QLineEdit, + QPushButton, + QRadioButton, + QVBoxLayout, ) -from .function_diff import LinearFunctionDiff, BFSFunctionDiff +from .function_diff import BFSFunctionDiff, LinearFunctionDiff class SettingsDialog(QDialog):