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

Remove all deprecated alias in the core of slixmpp, and wherever they were used.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot
2014-09-21 18:51:06 +02:00
committed by Florent Le Coz
parent 61f89eef2e
commit 7c3e61950d
29 changed files with 80 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slixmpp/plugins/xep_0009/remote.py
View File

@@ -453,7 +453,7 @@ class RemoteSession(object):
def _notify(self, event):
log.debug("RPC Session as %s started.", self._client.boundjid.full)
self._client.sendPresence()
self._client.send_presence()
self._event.set()
pass
@@ -733,10 +733,10 @@ class Remote(object):
'''
client = slixmpp.ClientXMPP(jid, password)
#? Register plug-ins.
client.registerPlugin('xep_0004') # Data Forms
client.registerPlugin('xep_0009') # Jabber-RPC
client.registerPlugin('xep_0030') # Service Discovery
client.registerPlugin('xep_0060') # PubSub
client.registerPlugin('xep_0199') # XMPP Ping
client.register_plugin('xep_0004') # Data Forms
client.register_plugin('xep_0009') # Jabber-RPC
client.register_plugin('xep_0030') # Service Discovery
client.register_plugin('xep_0060') # PubSub
client.register_plugin('xep_0199') # XMPP Ping
return cls.new_session_with_client(client, callback)

8
slixmpp/plugins/xep_0009/rpc.py
View File

@@ -55,7 +55,7 @@ class XEP_0009(BasePlugin):
self.xmpp['xep_0030'].add_identity('automation','rpc')
def make_iq_method_call(self, pto, pmethod, params):
iq = self.xmpp.makeIqSet()
iq = self.xmpp.make_iq_set()
iq.attrib['to'] = pto
iq.attrib['from'] = self.xmpp.boundjid.full
iq.enable('rpc_query')
@@ -64,7 +64,7 @@ class XEP_0009(BasePlugin):
return iq
def make_iq_method_response(self, pid, pto, params):
iq = self.xmpp.makeIqResult(pid)
iq = self.xmpp.make_iq_result(pid)
iq.attrib['to'] = pto
iq.attrib['from'] = self.xmpp.boundjid.full
iq.enable('rpc_query')
@@ -72,7 +72,7 @@ class XEP_0009(BasePlugin):
return iq
def make_iq_method_response_fault(self, pid, pto, params):
iq = self.xmpp.makeIqResult(pid)
iq = self.xmpp.make_iq_result(pid)
iq.attrib['to'] = pto
iq.attrib['from'] = self.xmpp.boundjid.full
iq.enable('rpc_query')
@@ -81,7 +81,7 @@ class XEP_0009(BasePlugin):
return iq
# def make_iq_method_error(self, pto, pid, pmethod, params, code, type, condition):
# iq = self.xmpp.makeIqError(pid)
# iq = self.xmpp.make_iq_error(pid)
# iq.attrib['to'] = pto
# iq.attrib['from'] = self.xmpp.boundjid.full
# iq['error']['code'] = code