diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-06-01 21:45:15 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-06-01 21:45:15 -0700 |
| commit | 18e27d65ce47d877d6b2c810979df640aba7d8ba (patch) | |
| tree | 942ed2d45a54e830d6e7c005e3f872c480477866 /sleekxmpp/stanza | |
| parent | 0c39567f208db4938614e9723901037d8801fb25 (diff) | |
| parent | aa916c9ac893a976c8e26ee07ca4a9768a5e1680 (diff) | |
| download | slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.gz slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.bz2 slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.tar.xz slixmpp-18e27d65ce47d877d6b2c810979df640aba7d8ba.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index f87b6490..ee46722a 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -11,7 +11,7 @@ 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')) + 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',)) |