diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-05-24 19:34:49 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-05-24 19:34:49 -0700 |
| commit | f165b4b52b3bbf1989a6144c3e6417f3756c62b6 (patch) | |
| tree | 84ec8915c1676a4791309ebc82f861f49a4e8c0a /sleekxmpp/stanza | |
| parent | 7ebc0065167189186ddf53e81a47dab887c87a72 (diff) | |
| parent | 5ca4ede5ac1ddbc56e97010a2f39ed6ada37817e (diff) | |
| download | slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.gz slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.bz2 slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.xz slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.zip | |
Merge branch 'master' of git@github.com:fritzy/SleekXMPP
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index 15af6624..f87b6490 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -12,7 +12,7 @@ class Error(ElementBase): name = 'error' plugin_attrib = 'error' conditions = set(('bad-request', 'conflict', 'feature-not-implemented', 'forbidden', 'gone', 'item-not-found', 'jid-malformed', 'not-acceptable', 'not-allowed', 'not-authorized', 'payment-required', 'recipient-unavailable', 'redirect', 'registration-required', 'remote-server-not-found', 'remote-server-timeout', 'service-unavailable', 'subscription-required', 'undefined-condition', 'unexpected-request')) - interfaces = set(('condition', 'text', 'type')) + interfaces = set(('code', 'condition', 'text', 'type')) types = set(('cancel', 'continue', 'modify', 'auth', 'wait')) sub_interfaces = set(('text',)) condition_ns = 'urn:ietf:params:xml:ns:xmpp-stanzas' diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index 4969b703..ded7515f 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -37,6 +37,7 @@ class Iq(RootStanza): def setPayload(self, value): self.clear() StanzaBase.setPayload(self, value) + return self def setQuery(self, value): query = self.xml.find("{%s}query" % value) |