diff options
author | foxx <cal@iops.io> | 2014-09-09 11:10:18 +0100 |
---|---|---|
committer | foxx <cal@iops.io> | 2014-09-09 11:10:18 +0100 |
commit | 0466562a132a57b69f086bba3416aa5fd7461c9b (patch) | |
tree | 9f0b1a254fcf64c354528918c511b3ceeb2e87c7 | |
parent | b6499ce71cf49d88144ae3f26b90852284fd0444 (diff) | |
download | rq-0466562a132a57b69f086bba3416aa5fd7461c9b.tar.gz |
Fixes from comments in #415
Added tox/vagrant tmp dir to gitignore
Removed unused import
Renamed id to job_id in enqueue_call() as per comments in #415
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | rq/job.py | 1 | ||||
-rw-r--r-- | rq/queue.py | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -7,3 +7,6 @@ /.tox /dist /build +.tox +.vagrant +Vagrantfile
\ No newline at end of file @@ -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. |