diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
| commit | 9591cd3a7e94a663675d97b1db93c2c585d948dc (patch) | |
| tree | b9e067447d7a269651b0b4e60fc7255b127aed79 /sleekxmpp/stanza/error.py | |
| parent | db92fa23303f1115ef8bf938efb6d686d9c3fa0a (diff) | |
| parent | afeb8a679a9895726eea5669b73c83d57bb03dff (diff) | |
| download | slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.gz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.bz2 slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.xz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.zip | |
Merge branch 'stream_features' into develop
Diffstat (limited to 'sleekxmpp/stanza/error.py')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index 5d1ce50d..93231a48 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -88,7 +88,9 @@ class Error(ElementBase): """Return the condition element's name.""" for child in self.xml.getchildren(): if "{%s}" % self.condition_ns in child.tag: - return child.tag.split('}', 1)[-1] + cond = child.tag.split('}', 1)[-1] + if cond in self.conditions: + return cond return '' def set_condition(self, value): |