From e0824802cae17dfbb4dc99ee579befa978cc7f09 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sun, 5 Aug 2018 15:12:18 +0200 Subject: [PATCH] Use isinstance instead of typeof --- django_q/tasks.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/django_q/tasks.py b/django_q/tasks.py index 6675561..4769c3d 100644 --- a/django_q/tasks.py +++ b/django_q/tasks.py @@ -1,27 +1,28 @@ """Provides task functionality.""" # Standard from time import sleep, time -from multiprocessing import Value # django from django.db import IntegrityError from django.utils import timezone +from multiprocessing import Value +from django_q.brokers import get_broker # local from django_q.cluster import worker, monitor -from django_q.signing import SignedPackage from django_q.conf import Conf, logger -from django_q.models import Schedule, Task from django_q.humanhash import uuid -from django_q.brokers import get_broker -from django_q.signals import pre_enqueue +from django_q.models import Schedule, Task from django_q.queues import Queue +from django_q.signals import pre_enqueue +from django_q.signing import SignedPackage def async_task(func, *args, **kwargs): """Queue a task for the cluster.""" keywords = kwargs.copy() - opt_keys = ('hook', 'group', 'save', 'sync', 'cached', 'ack_failure', 'iter_count', 'iter_cached', 'chain', 'broker') + opt_keys = ( + 'hook', 'group', 'save', 'sync', 'cached', 'ack_failure', 'iter_count', 'iter_cached', 'chain', 'broker') q_options = keywords.pop('q_options', {}) # get an id tag = uuid() @@ -410,7 +411,7 @@ def async_iter(func, args_iter, **kwargs): broker = options['broker'] broker.cache.set('{}:{}:args'.format(broker.list_key, iter_group), SignedPackage.dumps(args_iter)) for args in args_iter: - if type(args) is not tuple: + if not isinstance(args, tuple): args = (args,) async_task(func, *args, **options) return iter_group