summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-24 12:11:34 -0400
committerLance Stout <lancestout@gmail.com>2010-10-24 12:11:34 -0400
commitd9aff3d36f154867d45c812b6741730884d46c50 (patch)
tree4924c3ffbcd57948dbe7c4f131e7c1c5a3bbab84 /sleekxmpp/stanza
parent04cc48775d32b160fbfb64a8574cf8f0e3a6e54f (diff)
parent27ebb6e8f69d7b491b99044296a8b881195a21f6 (diff)
downloadslixmpp-d9aff3d36f154867d45c812b6741730884d46c50.tar.gz
slixmpp-d9aff3d36f154867d45c812b6741730884d46c50.tar.bz2
slixmpp-d9aff3d36f154867d45c812b6741730884d46c50.tar.xz
slixmpp-d9aff3d36f154867d45c812b6741730884d46c50.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/stanza')
-rw-r--r--sleekxmpp/stanza/presence.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/sleekxmpp/stanza/presence.py b/sleekxmpp/stanza/presence.py
index 964ef11a..7dcd8f90 100644
--- a/sleekxmpp/stanza/presence.py
+++ b/sleekxmpp/stanza/presence.py
@@ -92,6 +92,12 @@ class Presence(RootStanza):
return StanzaBase.setup(self, xml)
+ def exception(self, e):
+ """
+ Override exception passback for presence.
+ """
+ pass
+
def set_show(self, show):
"""
Set the value of the <show> element.