diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-09-21 18:51:06 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-09-28 23:58:46 +0200 |
| commit | 7c3e61950d902441dfb86de0cdebbc4ff38033a3 (patch) | |
| tree | f714fc81382d320875ca7745f1f3d68c4ace78cf /slixmpp/plugins/xep_0009 | |
| parent | 61f89eef2eac74821fae12e0389e58dc1a05a075 (diff) | |
| download | slixmpp-7c3e61950d902441dfb86de0cdebbc4ff38033a3.tar.gz slixmpp-7c3e61950d902441dfb86de0cdebbc4ff38033a3.tar.bz2 slixmpp-7c3e61950d902441dfb86de0cdebbc4ff38033a3.tar.xz slixmpp-7c3e61950d902441dfb86de0cdebbc4ff38033a3.zip | |
Remove all deprecated alias in the core of slixmpp, and wherever they were used.
Diffstat (limited to 'slixmpp/plugins/xep_0009')
| -rw-r--r-- | slixmpp/plugins/xep_0009/remote.py | 12 | ||||
| -rw-r--r-- | slixmpp/plugins/xep_0009/rpc.py | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/slixmpp/plugins/xep_0009/remote.py b/slixmpp/plugins/xep_0009/remote.py index 99df929a..b7612c03 100644 --- a/slixmpp/plugins/xep_0009/remote.py +++ b/slixmpp/plugins/xep_0009/remote.py @@ -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) diff --git a/slixmpp/plugins/xep_0009/rpc.py b/slixmpp/plugins/xep_0009/rpc.py index 05960981..5ed8b84c 100644 --- a/slixmpp/plugins/xep_0009/rpc.py +++ b/slixmpp/plugins/xep_0009/rpc.py @@ -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 |