From fe50d75858eeb84dcc344c04957160550ac28278 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Tue, 4 Feb 2020 12:31:08 +0000 Subject: [PATCH] fw/instrument: derive Instrument from TargetedPlugin Change Instrument to derive from TargetedPlugin rather than Plugin, which it should have been all along. --- wa/framework/instrument.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wa/framework/instrument.py b/wa/framework/instrument.py index 4611f86b..08da7025 100644 --- a/wa/framework/instrument.py +++ b/wa/framework/instrument.py @@ -104,7 +104,7 @@ import inspect from collections import OrderedDict from wa.framework import signal -from wa.framework.plugin import Plugin +from wa.framework.plugin import TargetedPlugin from wa.framework.exception import (TargetNotRespondingError, TimeoutError, # pylint: disable=redefined-builtin WorkloadError, TargetError) from wa.utils.log import log_error @@ -421,14 +421,13 @@ def get_disabled(): return [i for i in installed if not i.is_enabled] -class Instrument(Plugin): +class Instrument(TargetedPlugin): """ Base class for instrument implementations. """ kind = "instrument" - def __init__(self, target, **kwargs): - super(Instrument, self).__init__(**kwargs) - self.target = target + def __init__(self, *args, **kwargs): + super(Instrument, self).__init__(*args, **kwargs) self.is_enabled = True self.is_broken = False