summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza/nick.py
diff options
context:
space:
mode:
authorBrian Beggs <macdiesel@speakeasy.net>2010-05-14 10:59:41 -0400
committerBrian Beggs <macdiesel@speakeasy.net>2010-05-14 10:59:41 -0400
commit4b322720b39731d16fefedd8a77b3f9bb1684d7e (patch)
tree330e3a05f35675b0779060656156cefe320e27f2 /sleekxmpp/stanza/nick.py
parent1521a8b5c9d656ef80a4caf3d7daa86f8f504423 (diff)
parent7522839141e7dd5bd081a421a58b0962b705fdda (diff)
downloadslixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.gz
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.bz2
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.xz
slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.zip
Merge remote branch 'tom/master'
Diffstat (limited to 'sleekxmpp/stanza/nick.py')
-rw-r--r--sleekxmpp/stanza/nick.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/nick.py b/sleekxmpp/stanza/nick.py
index 92a523d6..ac7e3604 100644
--- a/sleekxmpp/stanza/nick.py
+++ b/sleekxmpp/stanza/nick.py
@@ -22,4 +22,5 @@ class Nick(ElementBase):
return self.xml.text
def delNick(self):
- return self.__del__()
+ if self.parent is not None:
+ self.parent().xml.remove(self.xml)