Remove backend for do() calls

This commit is contained in:
Florent 2014-10-09 11:04:09 +02:00
commit 628c63f899
33 changed files with 112 additions and 113 deletions

View file

@ -87,7 +87,7 @@ class HaveDate(Boobmsg):
"""
_id, backend_name = self.parse_id(id, unique_backend=True)
for backend, query in self.do('send_query', _id, backends=backend_name):
for query in self.do('send_query', _id, backends=backend_name):
print('%s' % query.message)
def edit_optims(self, backend_names, optims_names, stop=False):
@ -97,9 +97,9 @@ class HaveDate(Boobmsg):
for optim_name in optims_names.split():
backends_optims = {}
for backend, optim in self.do('get_optimization', optim_name, backends=backend_names):
for optim in self.do('get_optimization', optim_name, backends=backend_names):
if optim:
backends_optims[backend.name] = optim
backends_optims[optim.backend] = optim
for backend_name, optim in backends_optims.iteritems():
if len(optim.CONFIG) == 0:
print('%s.%s does not require configuration.' % (backend_name, optim_name))
@ -132,7 +132,7 @@ class HaveDate(Boobmsg):
if store:
storage_optim = set(self.storage.get('optims', optim_name, default=[]))
self.stdout.write('%sing %s:' % (function.capitalize(), optim_name))
for useless, optim in self.do('get_optimization', optim_name, backends=backend_names):
for optim in self.do('get_optimization', optim_name, backends=backend_names):
if optim:
# It's useless to start a started optim, or to stop a stopped one.
if (function == 'start' and optim.is_running()) or \
@ -183,7 +183,7 @@ class HaveDate(Boobmsg):
else:
backend = args[2]
optims = set()
for backend, (name, optim) in self.do('iter_optimizations', backends=backend):
for (name, optim) in self.do('iter_optimizations', backends=backend):
optims.add(name)
return sorted(optims - set(args[3:]))
@ -222,7 +222,7 @@ class HaveDate(Boobmsg):
optims = {}
backends = set()
for backend, (name, optim) in self.do('iter_optimizations', backends=backend_name):
for (name, optim) in self.do('iter_optimizations', backends=backend_name):
if optims_names is not None and not name in optims_names:
continue
if optim.is_running():
@ -230,10 +230,10 @@ class HaveDate(Boobmsg):
else:
status = '-------'
if not name in optims:
optims[name] = {backend.name: status}
optims[name] = {optim.backend: status}
else:
optims[name][backend.name] = status
backends.add(backend.name)
optims[name][optim.backend] = status
backends.add(optim.backend)
backends = sorted(backends)
for name, backends_status in optims.iteritems():
@ -257,5 +257,5 @@ class HaveDate(Boobmsg):
"""
self.change_path([u'events'])
self.start_format()
for backend, event in self.do('iter_events'):
for event in self.do('iter_events'):
self.cached_format(event)