Fixed some little bugs i found, cleanup some code, move examples.py t…

…o the examples directory and other sensical stuff

beanstalk/job.py

@@ -1,14 +1,14 @@
 from functools import wraps
 import yaml
-from errors import FailureError, JobError
+import errors
 
 DEFAULT_CONN = None
 
 def honorimmutable(func):
     @wraps(func)
     def deco(*args, **kw):
-        if args[0]._imutable:
-            raise JobError("Cannot do that to a job you don't own")
+        if args[0].imutable:
+            raise errors.JobError("Cannot do that to a job you don't own")
         return func(*args, **kw)
     return deco
 
@@ -49,13 +49,12 @@ def __init__(self, conn = None, jid=0, pri=0, data='', state = 'ok',**kw):
         else:
             self.data = ''
 
-        self._imutable = bool(kw.get('imutable'), False)
+        self.imutable = bool(kw.get('imutable', False))
         self._from_queue = bool(kw.get('from_queue', False))
         self.tube = kw.get('tube', 'default')
 
     def __del__(self):
-        self.Delete()
-        super(Job, self).__del__()
+        self.Finish()
 
     def __str__(self):
         return self._serialize()
@@ -73,7 +72,7 @@ def Queue(self):
         if self._from_queue:
             self.Delay(self.delay)
             return
-        oldtube = self.conn.current_tube
+        oldtube = self.conn.tube
         if oldtube != self.tube:
             self.conn.use(self.tube)
         self.conn.put(self._serialize(), self.priority, self.delay)

beanstalk/serverconn.py

@@ -58,8 +58,8 @@ def _get_response(self, handler):
             res = handler(recv)
             if res: break
 
-        if self.job and 'jid' in job:
-            res = self.job(res)
+        if self.job and 'jid' in res:
+            res = self.job(conn=self,**res)
         return res
 
 

examples/example.py → examples/simple_clients.py

@@ -4,24 +4,24 @@
 import select
 
 # pybeanstalk imports
-import serverconn
-import job
+from beanstalk import serverconn
+from beanstalk import job
 
 def producer_main(connection):
     i = 0
     while True:
         data = 'This is data to be consumed (%s)!' % (i,)
         print data
         data = job.Job(data=data, conn=connection)
-        data.put()
+        data.Queue()
         time.sleep(1)
         i += 1;
 
 def consumer_main(connection):
     while True:
         j = connection.reserve()
         print 'got job! job is: %s' % j.data
-        j.delete()
+        j.Finish()
 
 def main():
     try:

setup.py

@@ -13,7 +13,7 @@
 '''
 
 setup(name='pybeanstalk',
-      version='0.10.0',
+      version='0.11.1',
       description='A python client library for beanstalkd.',
       long_description = description_long,
       author='Erich Heine',