jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get the IoT plugins to pass tests on Py3

Browse Source
This commit is contained in:
Lance Stout 2014-02-06 09:54:45 -08:00
parent 49acdac776
commit a2423b8499
5 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/plugins/xep_0323/device.py
View File

@ -238,7 +238,7 @@ class Device(object):
flags -- [optional] data classifier flags for the field, e.g. momentary flags -- [optional] data classifier flags for the field, e.g. momentary
Formatted as a dictionary like { "flag name": "flag value" ... } Formatted as a dictionary like { "flag name": "flag value" ... }
""" """
if not self.fields.has_key(name): if name not in self.fields:
return False; return False;
if flags is None: if flags is None:
flags = {}; flags = {};

20
sleekxmpp/plugins/xep_0323/stanza/sensordata.py
View File

@ -124,10 +124,10 @@ class Request(ElementBase):
def get_nodes(self): def get_nodes(self):
"""Return all nodes.""" """Return all nodes."""
nodes = set() nodes = []
for node in self['substanzas']: for node in self['substanzas']:
if isinstance(node, RequestNode): if isinstance(node, RequestNode):
nodes.add(node) nodes.append(node)
return nodes return nodes
def set_nodes(self, nodes): def set_nodes(self, nodes):
@ -190,10 +190,10 @@ class Request(ElementBase):
def get_fields(self): def get_fields(self):
"""Return all fields.""" """Return all fields."""
fields = set() fields = []
for field in self['substanzas']: for field in self['substanzas']:
if isinstance(field, RequestField): if isinstance(field, RequestField):
fields.add(field) fields.append(field)
return fields return fields
def set_fields(self, fields): def set_fields(self, fields):
@ -351,10 +351,10 @@ class Fields(ElementBase):
def get_nodes(self): def get_nodes(self):
"""Return all nodes.""" """Return all nodes."""
nodes = set() nodes = []
for node in self['substanzas']: for node in self['substanzas']:
if isinstance(node, FieldsNode): if isinstance(node, FieldsNode):
nodes.add(node) nodes.append(node)
return nodes return nodes
def set_nodes(self, nodes): def set_nodes(self, nodes):
@ -450,10 +450,10 @@ class FieldsNode(ElementBase):
def get_timestamps(self): def get_timestamps(self):
"""Return all timestamps.""" """Return all timestamps."""
#print(str(id(self)) + " get_timestamps: ") #print(str(id(self)) + " get_timestamps: ")
timestamps = set() timestamps = []
for timestamp in self['substanzas']: for timestamp in self['substanzas']:
if isinstance(timestamp, Timestamp): if isinstance(timestamp, Timestamp):
timestamps.add(timestamp) timestamps.append(timestamp)
return timestamps return timestamps
def set_timestamps(self, timestamps): def set_timestamps(self, timestamps):
@ -634,10 +634,10 @@ class Timestamp(ElementBase):
def get_datas(self): def get_datas(self):
""" Return all data elements. """ """ Return all data elements. """
datas = set() datas = []
for data in self['substanzas']: for data in self['substanzas']:
if isinstance(data, Field): if isinstance(data, Field):
datas.add(data) datas.append(data)
return datas return datas
def set_datas(self, datas): def set_datas(self, datas):

12
sleekxmpp/plugins/xep_0325/stanza/control.py
View File

@ -83,10 +83,10 @@ class ControlSet(ElementBase):
def get_nodes(self): def get_nodes(self):
"""Return all nodes.""" """Return all nodes."""
nodes = set() nodes = []
for node in self['substanzas']: for node in self['substanzas']:
if isinstance(node, RequestNode): if isinstance(node, RequestNode):
nodes.add(node) nodes.append(node)
return nodes return nodes
def set_nodes(self, nodes): def set_nodes(self, nodes):
@ -175,10 +175,10 @@ class ControlSet(ElementBase):
def get_datas(self): def get_datas(self):
""" Return all data elements. """ """ Return all data elements. """
datas = set() datas = []
for data in self['substanzas']: for data in self['substanzas']:
if isinstance(data, BaseParameter): if isinstance(data, BaseParameter):
datas.add(data) datas.append(data)
return datas return datas
def set_datas(self, datas): def set_datas(self, datas):
@ -274,10 +274,10 @@ class ControlSetResponse(ElementBase):
def get_nodes(self): def get_nodes(self):
"""Return all nodes.""" """Return all nodes."""
nodes = set() nodes = []
for node in self['substanzas']: for node in self['substanzas']:
if isinstance(node, RequestNode): if isinstance(node, RequestNode):
nodes.add(node) nodes.append(node)
return nodes return nodes
def set_nodes(self, nodes): def set_nodes(self, nodes):

22
tests/test_stream_xep_0323.py
View File

@ -572,16 +572,16 @@ class TestStreamSensorData(SleekTest):
self.failUnlessEqual(results, ["accepted","fields","done"]); self.failUnlessEqual(results, ["accepted","fields","done"]);
# self.assertIn("nodeId", callback_data); # self.assertIn("nodeId", callback_data);
self.assertTrue(callback_data.has_key("nodeId")); self.assertTrue("nodeId" in callback_data)
self.failUnlessEqual(callback_data["nodeId"], "Device33"); self.failUnlessEqual(callback_data["nodeId"], "Device33");
# self.assertIn("timestamp", callback_data); # self.assertIn("timestamp", callback_data);
self.assertTrue(callback_data.has_key("timestamp")); self.assertTrue("timestamp" in callback_data);
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02"); self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02");
#self.assertIn("field_Voltage", callback_data); #self.assertIn("field_Voltage", callback_data);
self.assertTrue(callback_data.has_key("field_Voltage")); self.assertTrue("field_Voltage" in callback_data);
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}}); self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}});
#self.assertIn("field_TestBool", callback_data); #self.assertIn("field_TestBool", callback_data);
self.assertTrue(callback_data.has_key("field_TestBool")); self.assertTrue("field_TestBool" in callback_data);
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" }); self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" });
def testServiceDiscoveryClient(self): def testServiceDiscoveryClient(self):
@ -693,13 +693,13 @@ class TestStreamSensorData(SleekTest):
self.failUnlessEqual(results, ["accepted","failure"]); self.failUnlessEqual(results, ["accepted","failure"]);
# self.assertIn("nodeId", callback_data); # self.assertIn("nodeId", callback_data);
self.assertTrue(callback_data.has_key("nodeId")); self.assertTrue("nodeId" in callback_data);
self.failUnlessEqual(callback_data["nodeId"], "Device33"); self.failUnlessEqual(callback_data["nodeId"], "Device33");
# self.assertIn("timestamp", callback_data); # self.assertIn("timestamp", callback_data);
self.assertTrue(callback_data.has_key("timestamp")); self.assertTrue("timestamp" in callback_data);
self.failUnlessEqual(callback_data["timestamp"], "2013-03-07T17:13:30"); self.failUnlessEqual(callback_data["timestamp"], "2013-03-07T17:13:30");
# self.assertIn("error_msg", callback_data); # self.assertIn("error_msg", callback_data);
self.assertTrue(callback_data.has_key("error_msg")); self.assertTrue("error_msg" in callback_data);
self.failUnlessEqual(callback_data["error_msg"], "Timeout."); self.failUnlessEqual(callback_data["error_msg"], "Timeout.");
def testDelayedRequest(self): def testDelayedRequest(self):
@ -1095,16 +1095,16 @@ class TestStreamSensorData(SleekTest):
self.failUnlessEqual(results, ["queued","started","fields","done"]); self.failUnlessEqual(results, ["queued","started","fields","done"]);
# self.assertIn("nodeId", callback_data); # self.assertIn("nodeId", callback_data);
self.assertTrue(callback_data.has_key("nodeId")); self.assertTrue("nodeId" in callback_data);
self.failUnlessEqual(callback_data["nodeId"], "Device33"); self.failUnlessEqual(callback_data["nodeId"], "Device33");
# self.assertIn("timestamp", callback_data); # self.assertIn("timestamp", callback_data);
self.assertTrue(callback_data.has_key("timestamp")); self.assertTrue("timestamp" in callback_data);
self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02"); self.failUnlessEqual(callback_data["timestamp"], "2000-01-01T00:01:02");
# self.assertIn("field_Voltage", callback_data); # self.assertIn("field_Voltage", callback_data);
self.assertTrue(callback_data.has_key("field_Voltage")); self.assertTrue("field_Voltage" in callback_data);
self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}}); self.failUnlessEqual(callback_data["field_Voltage"], {"name": "Voltage", "value": "230.4", "typename": "numeric", "unit": "V", "flags": {"invoiced": "true"}});
# self.assertIn("field_TestBool", callback_data); # self.assertIn("field_TestBool", callback_data);
self.assertTrue(callback_data.has_key("field_TestBool")); self.assertTrue("field_TestBool" in callback_data);
self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" }); self.failUnlessEqual(callback_data["field_TestBool"], {"name": "TestBool", "value": "true", "typename": "boolean" });