renamed tools.misc to tools.trigger

This commit is contained in:
Goffi 2015-03-19 19:44:37 +01:00
commit 76065758df
6 changed files with 13 additions and 13 deletions

View file

@ -23,7 +23,7 @@ log = getLogger(__name__)
from twisted.words.protocols.jabber import jid
from twisted.internet import reactor, protocol
from sat.tools.misc import SkipOtherTriggers
from sat.tools import trigger
from sat.tools.utils import clean_ustr
PLUGIN_INFO = {
@ -57,10 +57,10 @@ class ExportCommandProtocol(protocol.ProcessProtocol):
log.info("connectionMade :)")
def outReceived(self, data):
self.parent.host.sendMessage(self.target, self._clean(data), no_trigger=True, profile_key=self.profile)
self.parent.host.sendMessage(self.target, self._clean(data), no_trigger=True, profile_key=self.profile)
def errReceived(self, data):
self.parent.host.sendMessage(self.target, self._clean(data), no_trigger=True, profile_key=self.profile)
self.parent.host.sendMessage(self.target, self._clean(data), no_trigger=True, profile_key=self.profile)
def processEnded(self, reason):
log.info (u"process finished: %d" % (reason.value.exitCode,))
@ -124,7 +124,7 @@ class CommandExport(object):
_continue &= process.boolOption("continue")
exclusive |= process.boolOption("exclusive")
if exclusive:
raise SkipOtherTriggers
raise trigger.SkipOtherTriggers
return _continue
return True
@ -144,7 +144,7 @@ class CommandExport(object):
if not profile:
log.warning("Unknown profile [%s]" % (profile,))
return
for target in targets:
try:
_jid = jid.JID(target)