diff options
| author | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
| commit | a189cb8333d5f59caa9015f0ded222696987d957 (patch) | |
| tree | 467f202bc7f85a4cde85a5add3c372515f18adc3 /sleekxmpp/stanza/error.py | |
| parent | 0d4825d3ea0562f305939e653e3d414e70e4aaa8 (diff) | |
| parent | 156b3200e3b5ad1b2e64eecc48cdc792f7b2ffd9 (diff) | |
| download | slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.gz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.bz2 slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.xz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP 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): |