github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-30 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

replaced usage of deprecated iq result on send. Fixed old send result to use stanzas instead of ElementTree

Browse source
This commit is contained in:
Nathan Fritz 2010-04-07 23:10:32 -07:00
parent 935ee4d14e
commit ecd5a172ed
9 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sleekxmpp/__init__.py
View file

@ -229,7 +229,8 @@ class ClientXMPP(basexmpp, XMLStream):
def handler_start_session(self, xml): def handler_start_session(self, xml):
if self.authenticated: if self.authenticated:
response = self.send(self.makeIqSet(xml), self.makeIq(self.getId())) iq = self.makeIqSet(xml)
response = iq.send()
logging.debug("Established Session") logging.debug("Established Session")
self.sessionstarted = True self.sessionstarted = True
self.event("session_start") self.event("session_start")

3
sleekxmpp/basexmpp.py
View file

@ -14,6 +14,7 @@ from . xmlstream.matcher.xmlmask import MatchXMLMask
from . xmlstream.matcher.many import MatchMany from . xmlstream.matcher.many import MatchMany
from . xmlstream.handler.xmlcallback import XMLCallback from . xmlstream.handler.xmlcallback import XMLCallback
from . xmlstream.handler.xmlwaiter import XMLWaiter from . xmlstream.handler.xmlwaiter import XMLWaiter
from . xmlstream.handler.waiter import Waiter
from . xmlstream.handler.callback import Callback from . xmlstream.handler.callback import Callback
from . import plugins from . import plugins
from . stanza.message import Message from . stanza.message import Message
@ -138,7 +139,7 @@ class basexmpp(object):
mask = mask.xml mask = mask.xml
data = str(data) data = str(data)
if mask is not None: if mask is not None:
waitfor = XMLWaiter('SendWait_%s' % self.getNewId(), MatchXMLMask(mask)) waitfor = Waiter('SendWait_%s' % self.getNewId(), MatchXMLMask(mask))
self.registerHandler(waitfor) self.registerHandler(waitfor)
self.sendRaw(data) self.sendRaw(data)
if mask is not None: if mask is not None:

2
sleekxmpp/plugins/gmail_notify.py
View file

@ -51,7 +51,7 @@ class gmail_notify(base.base_plugin):
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
iq.attrib['to'] = self.xmpp.jid iq.attrib['to'] = self.xmpp.jid
self.xmpp.makeIqQuery(iq, 'google:mail:notify') self.xmpp.makeIqQuery(iq, 'google:mail:notify')
emails = self.xmpp.send(iq, self.xmpp.makeIq(self.xmpp.id)) emails = iq.send()
mailbox = emails.find('{google:mail:notify}mailbox') mailbox = emails.find('{google:mail:notify}mailbox')
total = int(mailbox.get('total-matched', 0)) total = int(mailbox.get('total-matched', 0))
logging.info("%s New Gmail Messages" % total) logging.info("%s New Gmail Messages" % total)

4
sleekxmpp/plugins/xep_0030.py
View file

@ -93,7 +93,7 @@ class xep_0030(base.base_plugin):
self.xmpp.makeIqQuery(iq, 'http://jabber.org/protocol/disco#items') self.xmpp.makeIqQuery(iq, 'http://jabber.org/protocol/disco#items')
if node: if node:
iq.find('{http://jabber.org/protocol/disco#items}query').attrib['node'] = node iq.find('{http://jabber.org/protocol/disco#items}query').attrib['node'] = node
return self.xmpp.send(iq, "<iq id='%s' />" % iq.get('id')) return iq.send()
def getInfo(self, jid, node=None): def getInfo(self, jid, node=None):
iq = self.xmpp.makeIqGet() iq = self.xmpp.makeIqGet()
@ -102,7 +102,7 @@ class xep_0030(base.base_plugin):
self.xmpp.makeIqQuery(iq, 'http://jabber.org/protocol/disco#info') self.xmpp.makeIqQuery(iq, 'http://jabber.org/protocol/disco#info')
if node: if node:
iq.find('{http://jabber.org/protocol/disco#info}query').attrib['node'] = node iq.find('{http://jabber.org/protocol/disco#info}query').attrib['node'] = node
return self.xmpp.send(iq, self.xmpp.makeIq(iq.get('id'))) return iq.send()
def parseInfo(self, xml): def parseInfo(self, xml):
result = {'identity': {}, 'feature': []} result = {'identity': {}, 'feature': []}

2
sleekxmpp/plugins/xep_0045.py
View file

@ -182,7 +182,6 @@ class xep_0045(base.base_plugin):
form = form.getXML('submit') form = form.getXML('submit')
query.append(form) query.append(form)
iq.append(query) iq.append(query)
#result = self.xmpp.send(iq, self.xmpp.makeIq(iq.get('id')))
result = iq.send() result = iq.send()
if result['type'] == 'error': if result['type'] == 'error':
return False return False
@ -224,7 +223,6 @@ class xep_0045(base.base_plugin):
destroy.append(xreason) destroy.append(xreason)
query.append(destroy) query.append(destroy)
iq.append(query) iq.append(query)
#r = self.xmpp.send(iq, self.xmpp.makeIq(iq.get('id')))
r = iq.send() r = iq.send()
if r is False or r['type'] == 'error': if r is False or r['type'] == 'error':
return False return False

22
sleekxmpp/plugins/xep_0060.py
View file

@ -44,7 +44,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is False or result is None or result['type'] == 'error': return False if result is False or result is None or result['type'] == 'error': return False
return True return True
@ -64,7 +64,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is False or result is None or result['type'] == 'error': return False if result is False or result is None or result['type'] == 'error': return False
return True return True
@ -84,7 +84,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is False or result is None or result['type'] == 'error': return False if result is False or result is None or result['type'] == 'error': return False
return True return True
@ -103,7 +103,7 @@ class xep_0060(base.base_plugin):
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
#self.xmpp.add_handler("<iq id='%s'/>" % id, self.handlerCreateNodeResponse) #self.xmpp.add_handler("<iq id='%s'/>" % id, self.handlerCreateNodeResponse)
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result == False or result['type'] == 'error': if result is None or result == False or result['type'] == 'error':
logging.warning("got error instead of config") logging.warning("got error instead of config")
return False return False
@ -126,7 +126,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result == False or result['type'] == 'error': if result is None or result == False or result['type'] == 'error':
logging.warning("got error instead of config") logging.warning("got error instead of config")
return False return False
@ -149,7 +149,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result == False or result['type'] == 'error': if result is None or result == False or result['type'] == 'error':
logging.warning("got error instead of config") logging.warning("got error instead of config")
return False return False
@ -172,7 +172,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is not None and result is not False and result.attrib.get('type', 'error') != 'error': if result is not None and result is not False and result.attrib.get('type', 'error') != 'error':
return True return True
else: else:
@ -190,7 +190,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result['type'] == 'error': if result is None or result['type'] == 'error':
return False return False
return True return True
@ -211,7 +211,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result is False or result['type'] == 'error': return False if result is None or result is False or result['type'] == 'error': return False
return True return True
@ -227,7 +227,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result is False or result['type'] == 'error': return False if result is None or result is False or result['type'] == 'error': return False
return True return True
@ -281,7 +281,7 @@ class xep_0060(base.base_plugin):
iq.attrib['to'] = ps_jid iq.attrib['to'] = ps_jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq['id'] id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = iq.send()
if result is None or result is False or result['type'] == 'error': if result is None or result is False or result['type'] == 'error':
return False return False
return True return True

4
sleekxmpp/plugins/xep_0078.py
View file

@ -50,7 +50,7 @@ class xep_0078(base.base_plugin):
username.text = self.xmpp.username username.text = self.xmpp.username
auth_request_query.append(username) auth_request_query.append(username)
auth_request.append(auth_request_query) auth_request.append(auth_request_query)
result = self.xmpp.send(auth_request, self.xmpp.makeIqResult(self.xmpp.id)) result = auth_request.send()
rquery = result.find('{jabber:iq:auth}query') rquery = result.find('{jabber:iq:auth}query')
attempt = self.xmpp.makeIqSet() attempt = self.xmpp.makeIqSet()
query = ET.Element('{jabber:iq:auth}query') query = ET.Element('{jabber:iq:auth}query')
@ -69,7 +69,7 @@ class xep_0078(base.base_plugin):
digest.text = hashlib.sha1(b"%s%s" % (self.streamid, self.xmpp.password)).hexdigest() digest.text = hashlib.sha1(b"%s%s" % (self.streamid, self.xmpp.password)).hexdigest()
query.append(digest) query.append(digest)
attempt.append(query) attempt.append(query)
result = self.xmpp.send(attempt, self.xmpp.makeIq(self.xmpp.id)) result = attempt.send()
if result.attrib['type'] == 'result': if result.attrib['type'] == 'result':
with self.xmpp.lock: with self.xmpp.lock:
self.xmpp.authenticated = True self.xmpp.authenticated = True

2
sleekxmpp/plugins/xep_0092.py
View file

@ -55,7 +55,7 @@ class xep_0092(base.base_plugin):
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq.get('id') id = iq.get('id')
result = self.xmpp.send(iq, "<iq xmlns='%s' id='%s'/>" % (self.xmpp.default_ns, id)) result = iq.send()
if result and result is not None and result.get('type', 'error') != 'error': if result and result is not None and result.get('type', 'error') != 'error':
qry = result.find('{jabber:iq:version}query') qry = result.find('{jabber:iq:version}query')
version = {} version = {}

3
sleekxmpp/plugins/xep_0199.py
View file

@ -62,7 +62,8 @@ class xep_0199(base.base_plugin):
ping = ET.Element('{http://www.xmpp.org/extensions/xep-0199.html#ns}ping') ping = ET.Element('{http://www.xmpp.org/extensions/xep-0199.html#ns}ping')
iq.append(ping) iq.append(ping)
startTime = time.clock() startTime = time.clock()
pingresult = self.xmpp.send(iq, self.xmpp.makeIq(id), timeout) #pingresult = self.xmpp.send(iq, self.xmpp.makeIq(id), timeout)
pingresult = iq.send()
endTime = time.clock() endTime = time.clock()
if pingresult == False: if pingresult == False:
#self.xmpp.disconnect(reconnect=True) #self.xmpp.disconnect(reconnect=True)