diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2010-01-05 21:56:48 +0000 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2010-01-05 21:56:48 +0000 |
| commit | 093644ffbd6708121150c92359bce60408f924bb (patch) | |
| tree | a7d6da57ff76a8e54b1ec3703aeffeed82f34fa1 /sleekxmpp/stanza/presence.py | |
| parent | 805afa4bc1f44598d786fddc92c5129c62464227 (diff) | |
| download | slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.gz slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.bz2 slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.xz slixmpp-093644ffbd6708121150c92359bce60408f924bb.zip | |
* major stanza improvements
* raise XMPPError in handler to reply with error stanza
* started work on pubsub stanzas
Diffstat (limited to 'sleekxmpp/stanza/presence.py')
| -rw-r--r-- | sleekxmpp/stanza/presence.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sleekxmpp/stanza/presence.py b/sleekxmpp/stanza/presence.py index cb6bd6ce..6a8247c5 100644 --- a/sleekxmpp/stanza/presence.py +++ b/sleekxmpp/stanza/presence.py @@ -1,8 +1,9 @@ from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET from . error import Error +from . rootstanza import RootStanza -class Presence(StanzaBase): +class Presence(RootStanza): interfaces = set(('type', 'to', 'from', 'id', 'status', 'priority')) types = set(('available', 'unavailable', 'error', 'probe', 'subscribe', 'subscribed', 'unsubscribe', 'unsubscribed')) showtypes = set(('dnd', 'ffc', 'xa', 'away')) @@ -52,12 +53,3 @@ class Presence(StanzaBase): elif self['type'] == 'subscribe': self['type'] = 'subscribed' return StanzaBase.reply(self) - - def exception(self, text): - self.reply() - self['error']['condition'] = 'undefined-condition' - self['error']['text'] = text - self.send() - -Presence.plugin_attrib_map['error'] = Error -Presence.plugin_tag_map["{%s}%s" % (Error.namespace, Error.name)] = Error |