Django users can live with another dependency.

ask · Sep 16, 2010 · 4eb60ae · 4eb60ae
1 parent 4bdd467
commit 4eb60ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/ghettoq/taproot.py b/ghettoq/taproot.py
@@ -14,12 +14,9 @@
 
 
 try:
-    from collections import OrderedDict as SortedDict
+    from collections import OrderedDict
 except ImportError:
-    try:
+    from odict import odict as OrderedDict
-        from django.utils.datastructures import SortedDict
-    except ImportError:
-        from odict import odict as SortedDict
 
 
 class QualityOfService(object):
@@ -30,7 +27,7 @@ def __init__(self, backend, resource, prefetch_count=None,
         self.resource = resource
         self.prefetch_count = prefetch_count
         self.interval = interval
-        self._delivered = SortedDict()
+        self._delivered = OrderedDict()
         self._restored_once = False
         atexit.register(self.restore_unacked_once)
 
@@ -51,7 +48,7 @@ def restore_unacked(self):
                                                 message.content_encoding)
             send["destination"] = queue_name
             self.resource.put(queue_name, serialize(send))
-        self._delivered = SortedDict()
+        self._delivered = OrderedDict()
 
     def requeue(self, delivery_tag):
         try:

diff --git a/setup.py b/setup.py
@@ -27,14 +27,10 @@
 if sys.version_info < (2, 5):
     install_requires.append("uuid")
 
-# We rely on a sorted dictionary implementation and use either python's
+# We rely on a sorted dictionary implementation and use either Python's
-# build-in OrderedDict, Django's SortedDict or odict.
+# built-in OrderedDict or the odict module.
-
 if sys.version_info < (2, 7):
-    try:
+    install_requires.append("odict")
-        import django
-    except ImportError:
-        install_requires.append("odict")
 
 
 def osx_install_data(install_data):