diff options
| author | Brian Beggs <macdiesel@speakeasy.net> | 2010-05-14 10:59:41 -0400 |
|---|---|---|
| committer | Brian Beggs <macdiesel@speakeasy.net> | 2010-05-14 10:59:41 -0400 |
| commit | 4b322720b39731d16fefedd8a77b3f9bb1684d7e (patch) | |
| tree | 330e3a05f35675b0779060656156cefe320e27f2 /sleekxmpp/stanza | |
| parent | 1521a8b5c9d656ef80a4caf3d7daa86f8f504423 (diff) | |
| parent | 7522839141e7dd5bd081a421a58b0962b705fdda (diff) | |
| download | slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.gz slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.bz2 slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.xz slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.zip | |
Merge remote branch 'tom/master'
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/stanza/htmlim.py | 3 | ||||
| -rw-r--r-- | sleekxmpp/stanza/nick.py | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index a1454d1e..15af6624 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -22,7 +22,7 @@ class Error(ElementBase): self['type'] = 'cancel' self['condition'] = 'feature-not-implemented' if self.parent is not None: - self.parent['type'] = 'error' + self.parent()['type'] = 'error' def getCondition(self): for child in self.xml.getchildren(): diff --git a/sleekxmpp/stanza/htmlim.py b/sleekxmpp/stanza/htmlim.py index f9ee985f..60686e4a 100644 --- a/sleekxmpp/stanza/htmlim.py +++ b/sleekxmpp/stanza/htmlim.py @@ -31,4 +31,5 @@ class HTMLIM(ElementBase): return html def delHtml(self): - return self.__del__() + if self.parent is not None: + self.parent().xml.remove(self.xml) 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) |