Merge branch 'master' into resweb

Matt George · Matt George · commit fcf85cd500d3 · 2009-11-19T21:59:24.000-06:00
Conflicts:
	requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 simplejson==2.0.9
 Jinja2==2.2.1
-itty==0.6.1
+itty==0.6.1
+redis==0.6.0
diff --git a/src/pyres/__init__.py b/src/pyres/__init__.py
@@ -71,7 +71,7 @@ def enqueue(cls, klass, *args):
         if queue:
             class_name = '%s.%s' % (klass.__module__, klass.__name__)
             #print class_name
-            resq.push(queue, {'klass':class_name,'args':args})
+            resq.push(queue, {'class':class_name,'args':args})
             #Job.create(queue, klass,*args)
     
     @classmethod
diff --git a/src/pyres/job.py b/src/pyres/job.py
@@ -7,7 +7,7 @@ def __init__(self, queue, payload, resq):
         self.resq = resq
     
     def perform(self):
-        payload_class_str = self._payload["klass"]
+        payload_class_str = self._payload["class"]
         payload_class = str_to_class(payload_class_str)
         args = self._payload.get("args", None)
         if args:
diff --git a/src/redis.py b/src/redis.py
