summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sleekxmpp/plugins/jobs.py6
-rw-r--r--todo1.06
2 files changed, 10 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/jobs.py b/sleekxmpp/plugins/jobs.py
index bb2e2554..30a76989 100644
--- a/sleekxmpp/plugins/jobs.py
+++ b/sleekxmpp/plugins/jobs.py
@@ -1,6 +1,7 @@
from . import base
import logging
from xml.etree import cElementTree as ET
+import types
class jobs(base.base_plugin):
def plugin_init(self):
@@ -20,7 +21,7 @@ class jobs(base.base_plugin):
def claimJob(self, host, node, jobid, ifrom=None):
return self._setState(host, node, jobid, ET.Element('{http://andyet.net/protocol/pubsubjob}claimed'))
- def unclaimJob(self, jobid):
+ def unclaimJob(self, host, node, jobid):
return self._setState(host, node, jobid, ET.Element('{http://andyet.net/protocol/pubsubjob}unclaimed'))
def finishJob(self, host, node, jobid, payload=None):
@@ -38,7 +39,8 @@ class jobs(base.base_plugin):
iq['psstate']['item'] = jobid
iq['psstate']['payload'] = state
result = iq.send()
- if result is None or result['type'] != 'result':
+ if result is None or type(result) == types.BooleanType or result['type'] != 'result':
+ logging.error("Unable to change %s:%s to %s" % (node, jobid, state))
return False
return True
diff --git a/todo1.0 b/todo1.0
index 5e9a43e1..593185bc 100644
--- a/todo1.0
+++ b/todo1.0
@@ -48,6 +48,10 @@ conn_tests and sleekxmpp/tests and sleekxmpp/xmlstresm/test.* -> convert to eith
Update setup.py - github url, version #
+scheduler needs unit tests
+
+__init__.py stream:features handler should use new state machine
+
-- PEP8 - all files
@@ -126,6 +130,8 @@ Unit tests
Clean commented code
+Use the new scheduler
+
-- Documentation