merge changes from master

cleanups and prepare for   pull request
This commit is contained in:
Kamil Sopko
2016-03-31 17:16:14 +02:00
parent 80d6c657d5
commit b333d136b5
4 changed files with 36 additions and 60 deletions

View File

@@ -1,5 +1,6 @@
from PyQt4 import QtCore
class Worker(QtCore.QObject):
"""
Implements a queue of tasks to be carried out in order
@@ -46,17 +47,6 @@ class Worker(QtCore.QObject):
self.allow_debug()
# 'worker_name' property of task allows to target
# specific worker.
#if 'worker_name' in task and task['worker_name'] == self.name:
# task['fcn'](*task['params'])
# return
#if 'worker_name' not in task and self.name is None:
# task['fcn'](*task['params'])
# return
if ('worker_name' in task and task['worker_name'] == self.name) or \
('worker_name' not in task and self.name is None):