diff options
| author | Thom Nichols <tmnichols@gmail.com> | 2010-06-01 22:54:30 -0400 |
|---|---|---|
| committer | Thom Nichols <tmnichols@gmail.com> | 2010-06-01 22:54:30 -0400 |
| commit | 49f5767aea2815211349d93aa03ce2b9dc088c1e (patch) | |
| tree | 3a63f08d009dc7d16560ac2fc464482649b4cd47 /sleekxmpp/stanza | |
| parent | 3e83b16a586b34dd686a4aeaea77c50a92f54b51 (diff) | |
| parent | e6c2fde2834fafbc35b52da7e523f2b351f53a15 (diff) | |
| download | slixmpp-49f5767aea2815211349d93aa03ce2b9dc088c1e.tar.gz slixmpp-49f5767aea2815211349d93aa03ce2b9dc088c1e.tar.bz2 slixmpp-49f5767aea2815211349d93aa03ce2b9dc088c1e.tar.xz slixmpp-49f5767aea2815211349d93aa03ce2b9dc088c1e.zip | |
merged changes from fritzy
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index 15af6624..ee46722a 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -11,8 +11,8 @@ class Error(ElementBase): namespace = 'jabber:client' 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')) + conditions = set(('bad-request', 'conflict', 'feature-not-implemented', 'forbidden', 'gone', 'internal-server-error', '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', 'resource-constraint', 'service-unavailable', 'subscription-required', 'undefined-condition', 'unexpected-request')) + 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) |