diff --git a/.gitignore b/.gitignore index ea8eaca..ff9c616 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /.tox /dist /build +.tox +.vagrant +Vagrantfile \ No newline at end of file diff --git a/rq/job.py b/rq/job.py index c5c5eae..937430e 100644 --- a/rq/job.py +++ b/rq/job.py @@ -7,7 +7,6 @@ import inspect import warnings from functools import partial from uuid import uuid4 -from uuid import UUID from rq.compat import as_text, decode_redis_hash, string_types, text_type diff --git a/rq/queue.py b/rq/queue.py index 1d77b78..959addd 100644 --- a/rq/queue.py +++ b/rq/queue.py @@ -164,7 +164,7 @@ class Queue(object): def enqueue_call(self, func, args=None, kwargs=None, timeout=None, result_ttl=None, description=None, depends_on=None, - id=None): + job_id=None): """Creates a job to represent the delayed function call and enqueues it. @@ -178,7 +178,7 @@ class Queue(object): job = self.job_class.create(func, args, kwargs, connection=self.connection, result_ttl=result_ttl, status=Status.QUEUED, description=description, depends_on=depends_on, timeout=timeout, - id=id) + id=job_id) # If job depends on an unfinished job, register itself on it's # parent's dependents instead of enqueueing it.