diff options
| author | Robert Robinson <rerobins@gmail.com> | 2015-09-18 13:30:30 -0600 |
|---|---|---|
| committer | Robert Robinson <rerobins@gmail.com> | 2015-09-18 13:30:30 -0600 |
| commit | 5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d (patch) | |
| tree | d21287dbbb7882b766098e0a81c0d1d3677d28d3 /sleekxmpp/stanza/rootstanza.py | |
| parent | e5582694c07236e6830c20361840360a1dde37f3 (diff) | |
| parent | d245558fd5eeee4fa34731ccea47c4c3132d805f (diff) | |
| download | slixmpp-5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d.tar.gz slixmpp-5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d.tar.bz2 slixmpp-5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d.tar.xz slixmpp-5fc14de32e7fbd4e33a0e1ed92d8fb23871a2a2d.zip | |
Merge pull request #3 from fritzy/develop
Merge to fritzy_master
Diffstat (limited to 'sleekxmpp/stanza/rootstanza.py')
| -rw-r--r-- | sleekxmpp/stanza/rootstanza.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sleekxmpp/stanza/rootstanza.py b/sleekxmpp/stanza/rootstanza.py index a7c2b218..52b807e5 100644 --- a/sleekxmpp/stanza/rootstanza.py +++ b/sleekxmpp/stanza/rootstanza.py @@ -60,7 +60,9 @@ class RootStanza(StanzaBase): self.send() elif isinstance(e, XMPPError): # We raised this deliberately + keep_id = self['id'] self.reply(clear=e.clear) + self['id'] = keep_id self['error']['condition'] = e.condition self['error']['text'] = e.text self['error']['type'] = e.etype @@ -72,7 +74,9 @@ class RootStanza(StanzaBase): self.send() else: # We probably didn't raise this on purpose, so send an error stanza + keep_id = self['id'] self.reply() + self['id'] = keep_id self['error']['condition'] = 'undefined-condition' self['error']['text'] = "SleekXMPP got into trouble." self['error']['type'] = 'cancel' |