From ed723092a8338669f4f60bdd302c3f89eb075fe1 Mon Sep 17 00:00:00 2001 From: Nir Izraeli Date: Wed, 21 Nov 2018 21:59:28 -0800 Subject: [PATCH] rename silent to auto --- idaplugin/rematch/{autoupload.py => automate.py} | 8 ++------ idaplugin/rematch/dialogs/__init__.py | 4 ++-- idaplugin/rematch/dialogs/{silent.py => auto.py} | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) rename idaplugin/rematch/{autoupload.py => automate.py} (89%) rename idaplugin/rematch/dialogs/{silent.py => auto.py} (88%) diff --git a/idaplugin/rematch/autoupload.py b/idaplugin/rematch/automate.py similarity index 89% rename from idaplugin/rematch/autoupload.py rename to idaplugin/rematch/automate.py index 32313209e..8ac3bd96c 100755 --- a/idaplugin/rematch/autoupload.py +++ b/idaplugin/rematch/automate.py @@ -1,11 +1,7 @@ import idaapi -try: - import rematch.actions as actions - import rematch.dialogs as dialogs -except ImportError: - from . import actions - from . import dialogs +from . import actions +from . import dialogs def main(): diff --git a/idaplugin/rematch/dialogs/__init__.py b/idaplugin/rematch/dialogs/__init__.py index d39ac5375..912530266 100755 --- a/idaplugin/rematch/dialogs/__init__.py +++ b/idaplugin/rematch/dialogs/__init__.py @@ -1,7 +1,7 @@ from . import base from . import widgets from . import gui -from . import silent +from . import auto from . import login from . import upload from . import match @@ -10,5 +10,5 @@ from . import settings from . import serializedgraph -__all__ = ['base', 'widgets', 'gui', 'silent', 'login', 'upload', 'match', +__all__ = ['base', 'widgets', 'gui', 'auto', 'login', 'upload', 'match', 'result', 'project', 'settings', 'serializedgraph'] diff --git a/idaplugin/rematch/dialogs/silent.py b/idaplugin/rematch/dialogs/auto.py similarity index 88% rename from idaplugin/rematch/dialogs/silent.py rename to idaplugin/rematch/dialogs/auto.py index 8cd662343..35bbc876b 100755 --- a/idaplugin/rematch/dialogs/silent.py +++ b/idaplugin/rematch/dialogs/auto.py @@ -2,15 +2,15 @@ from .base import BaseDialog -class SilentDialog(BaseDialog): +class AutoDialog(BaseDialog): def __init__(self, calls): # initialize super without any callbacks to avoid code review warnings - super(SilentDialog, self).__init__() + super(AutoDialog, self).__init__() self.data_value = None self.calls = calls def __call__(self, **kwargs): - super(SilentDialog, self).__init__(**kwargs) + super(AutoDialog, self).__init__(**kwargs) return self def show(self):