pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move XEP-0080 to the new system.

Browse source
This commit is contained in:
Lance Stout 2012-03-12 19:06:54 -07:00
parent 3467ac18cc
commit 67972c5e84
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sleekxmpp/plugins/xep_0080/__init__.py
View file

@ -6,5 +6,10 @@
See the file LICENSE for copying permission. See the file LICENSE for copying permission.
""" """
from sleekxmpp.plugins.base import register_plugin
from sleekxmpp.plugins.xep_0080.stanza import Geoloc from sleekxmpp.plugins.xep_0080.stanza import Geoloc
from sleekxmpp.plugins.xep_0080.geoloc import xep_0080 from sleekxmpp.plugins.xep_0080.geoloc import XEP_0080
register_plugin(XEP_0080)

30
sleekxmpp/plugins/xep_0080/geoloc.py
View file

@ -9,7 +9,7 @@
import logging import logging
import sleekxmpp import sleekxmpp
from sleekxmpp.plugins.base import base_plugin from sleekxmpp.plugins.base import BasePlugin
from sleekxmpp.xmlstream import register_stanza_plugin from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.plugins.xep_0080 import stanza, Geoloc from sleekxmpp.plugins.xep_0080 import stanza, Geoloc
@ -17,30 +17,20 @@ from sleekxmpp.plugins.xep_0080 import stanza, Geoloc
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class xep_0080(base_plugin): class XEP_0080(BasePlugin):
""" """
XEP-0080: User Location XEP-0080: User Location
""" """
name = 'xep_0080'
description = 'XEP-0080: User Location'
dependencies = set(['xep_0163'])
stanza = stanza
def plugin_init(self): def plugin_init(self):
""" """Start the XEP-0080 plugin."""
Start the XEP-0090 plugin. self.xmpp['xep_0163'].register_pep('user_location', Geoloc)
"""
self.xep = '0080'
self.description = 'User Location'
self.stanza = stanza
def post_init(self):
"""Handle inter-plugin dependencies."""
base_plugin.post_init(self)
pubsub_stanza = self.xmpp['xep_0060'].stanza
register_stanza_plugin(pubsub_stanza.EventItem, Geoloc)
self.xmpp['xep_0030'].add_feature(Geoloc.namespace)
self.xmpp['xep_0163'].add_interest(Geoloc.namespace)
self.xmpp['xep_0060'].map_node_event(Geoloc.namespace, 'user_location')
def publish_location(self, **kwargs): def publish_location(self, **kwargs):
""" """
@ -104,7 +94,6 @@ class xep_0080(base_plugin):
geoloc.values = kwargs geoloc.values = kwargs
return self.xmpp['xep_0163'].publish(geoloc, return self.xmpp['xep_0163'].publish(geoloc,
node=Geoloc.namespace,
options=options, options=options,
ifrom=ifrom, ifrom=ifrom,
block=block, block=block,
@ -127,7 +116,6 @@ class xep_0080(base_plugin):
""" """
geoloc = Geoloc() geoloc = Geoloc()
return self.xmpp['xep_0163'].publish(geoloc, return self.xmpp['xep_0163'].publish(geoloc,
node=Geoloc.namespace,
ifrom=ifrom, ifrom=ifrom,
block=block, block=block,
callback=callback, callback=callback,