From 8e85c7eee3625646a4bec65aa930eb519e2921dd Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@3rdcloud.com>
Date: Wed, 15 Feb 2012 15:54:02 +0100
Subject: [PATCH] Put Job directly in the top-level `rq` module.

---
 rq/__init__.py       | 5 +++--
 tests/test_job.py    | 2 +-
 tests/test_queue.py  | 3 +--
 tests/test_worker.py | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rq/__init__.py b/rq/__init__.py
index 64a5f359..3748cd31 100644
--- a/rq/__init__.py
+++ b/rq/__init__.py
@@ -1,7 +1,8 @@
 from redis import Redis
 from .proxy import conn
-from .queue import Queue
+from .queue import Queue, FailedQueue
 from .worker import Worker
+from .job import Job
 from .version import VERSION
 
 
@@ -19,5 +20,5 @@ def use_redis(redis=None):
         raise TypeError('Argument redis should be a Redis instance.')
     conn.push(redis)
 
-__all__ = ['conn', 'Queue', 'Worker', 'use_redis']
+__all__ = ['conn', 'Queue', 'FailedQueue', 'Worker', 'Job', 'use_redis']
 __version__ = VERSION
diff --git a/tests/test_job.py b/tests/test_job.py
index 6a36ba33..a065c787 100644
--- a/tests/test_job.py
+++ b/tests/test_job.py
@@ -3,7 +3,7 @@ from datetime import datetime
 from tests import RQTestCase
 from tests.helpers import strip_milliseconds
 from cPickle import loads
-from rq.job import Job
+from rq import Job
 from rq.exceptions import NoSuchJobError, UnpickleError
 
 
diff --git a/tests/test_queue.py b/tests/test_queue.py
index 92790b9e..6b7329ff 100644
--- a/tests/test_queue.py
+++ b/tests/test_queue.py
@@ -1,7 +1,6 @@
 from tests import RQTestCase
 from tests import testjob
-from rq import Queue
-from rq.job import Job
+from rq import Queue, FailedQueue, Job
 
 
 class TestQueue(RQTestCase):
diff --git a/tests/test_worker.py b/tests/test_worker.py
index 237ab726..10091cd9 100644
--- a/tests/test_worker.py
+++ b/tests/test_worker.py
@@ -2,8 +2,7 @@ import os
 from tests import RQTestCase
 from tests import testjob, failing_job
 from tests.helpers import strip_milliseconds
-from rq import Queue, Worker
-from rq.job import Job
+from rq import Queue, Worker, Job
 
 
 SENTINEL_FILE = '/tmp/rq-tests.txt'