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

xep-0323: removed deadcode

Browse Source
This commit is contained in:
Joshua Downer 2015-05-14 06:27:59 -04:00
parent a33bde9cc3
commit 3590b663ed
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sleekxmpp/plugins/xep_0323/sensordata.py
View File

@ -107,7 +107,6 @@ class XEP_0323(BasePlugin):
default_config = { default_config = {
'threaded': True 'threaded': True
# 'session_db': None
} }
def plugin_init(self): def plugin_init(self):
@ -300,8 +299,6 @@ class XEP_0323(BasePlugin):
self.sessions[session]["commTimers"] = {} self.sessions[session]["commTimers"] = {}
self.sessions[session]["nodeDone"] = {} self.sessions[session]["nodeDone"] = {}
#print("added session: " + str(self.sessions))
iq.reply() iq.reply()
iq['accepted']['seqnr'] = seqnr iq['accepted']['seqnr'] = seqnr
if not request_delay_sec is None: if not request_delay_sec is None:
@ -318,10 +315,8 @@ class XEP_0323(BasePlugin):
return return
if self.threaded: if self.threaded:
#print("starting thread")
tr_req = Thread(target=self._threaded_node_request, args=(session, process_fields, req_flags)) tr_req = Thread(target=self._threaded_node_request, args=(session, process_fields, req_flags))
tr_req.start() tr_req.start()
#print("started thread")
else: else:
self._threaded_node_request(session, process_fields, req_flags) self._threaded_node_request(session, process_fields, req_flags)
@ -348,7 +343,6 @@ class XEP_0323(BasePlugin):
for node in self.sessions[session]["node_list"]: for node in self.sessions[session]["node_list"]:
timer = TimerReset(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node)) timer = TimerReset(self.nodes[node]['commTimeout'], self._event_comm_timeout, args=(session, node))
self.sessions[session]["commTimers"][node] = timer self.sessions[session]["commTimers"][node] = timer
#print("Starting timer " + str(timer) + ", timeout: " + str(self.nodes[node]['commTimeout']))
timer.start() timer.start()
self.nodes[node]['device'].request_fields(process_fields, flags=flags, session=session, callback=self._device_field_request_callback) self.nodes[node]['device'].request_fields(process_fields, flags=flags, session=session, callback=self._device_field_request_callback)
@ -376,7 +370,6 @@ class XEP_0323(BasePlugin):
msg['failure']['done'] = 'true' msg['failure']['done'] = 'true'
msg.send() msg.send()
# The session is complete, delete it # The session is complete, delete it
#print("del session " + session + " due to timeout")
del self.sessions[session] del self.sessions[session]
def _event_delayed_req(self, session, process_fields, req_flags): def _event_delayed_req(self, session, process_fields, req_flags):
@ -466,7 +459,6 @@ class XEP_0323(BasePlugin):
if (self._all_nodes_done(session)): if (self._all_nodes_done(session)):
msg['failure']['done'] = 'true' msg['failure']['done'] = 'true'
# The session is complete, delete it # The session is complete, delete it
# print("del session " + session + " due to error")
del self.sessions[session] del self.sessions[session]
msg.send() msg.send()
else: else:
@ -493,7 +485,6 @@ class XEP_0323(BasePlugin):
msg['fields']['done'] = 'true' msg['fields']['done'] = 'true'
if (self._all_nodes_done(session)): if (self._all_nodes_done(session)):
# The session is complete, delete it # The session is complete, delete it
# print("del session " + session + " due to complete")
del self.sessions[session] del self.sessions[session]
else: else:
# Restart comm timer # Restart comm timer
@ -663,7 +654,6 @@ class XEP_0323(BasePlugin):
Received Iq with cancelled - this is a cancel confirm. Received Iq with cancelled - this is a cancel confirm.
Delete the session. Delete the session.
""" """
#print("Got cancelled")
seqnr = iq['cancelled']['seqnr'] seqnr = iq['cancelled']['seqnr']
callback = self.sessions[seqnr]["callback"] callback = self.sessions[seqnr]["callback"]
callback(from_jid=iq['from'], result="cancelled") callback(from_jid=iq['from'], result="cancelled")