pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make StreamError work properly.

Browse source 
Now uses the correct namespaces and condition names.
This commit is contained in:
Lance Stout 2011-01-27 16:02:57 -05:00
parent 35ef8f9090
commit 40642b2cd1
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sleekxmpp/stanza/stream_error.py
View file

@ -7,10 +7,11 @@
""" """
from sleekxmpp.stanza.error import Error from sleekxmpp.stanza.error import Error
from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin from sleekxmpp.xmlstream import StanzaBase, ElementBase, ET
from sleekxmpp.xmlstream import register_stanza_plugin
class StreamError(Error): class StreamError(Error, StanzaBase):
""" """
XMPP stanzas of type 'error' should include an <error> stanza that XMPP stanzas of type 'error' should include an <error> stanza that
@ -23,28 +24,25 @@ class StreamError(Error):
error that occur with the underlying XML stream itself, and not error that occur with the underlying XML stream itself, and not
a particular stanza. a particular stanza.
Note: The StreamError stanza is the same as the normal Error stanza, Note: The StreamError stanza is mostly the same as the normal
but with a different namespace. Error stanza, but with different namespaces and
condition names.
Example error stanza: Example error stanza:
<error type="cancel" code="404"> <stream:error>
<item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /> <not-well-formed xmlns="urn:ietf:params:xml:ns:xmpp-streams" />
<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"> <text xmlns="urn:ietf:params:xml:ns:xmpp-streams">
The item was not found. XML was not well-formed.
</text> </text>
</error> </stream:error>
Stanza Interface: Stanza Interface:
code -- The error code used in older XMPP versions.
condition -- The name of the condition element. condition -- The name of the condition element.
text -- Human readable description of the error. text -- Human readable description of the error.
type -- Error type indicating how the error should be handled.
Attributes: Attributes:
conditions -- The set of allowable error condition elements. conditions -- The set of allowable error condition elements.
condition_ns -- The namespace for the condition element. condition_ns -- The namespace for the condition element.
types -- A set of values indicating how the error
should be treated.
Methods: Methods:
setup -- Overrides ElementBase.setup. setup -- Overrides ElementBase.setup.
@ -57,3 +55,15 @@ class StreamError(Error):
""" """
namespace = 'http://etherx.jabber.org/streams' namespace = 'http://etherx.jabber.org/streams'
interfaces = set(('condition', 'text'))
conditions = set((
'bad-format', 'bad-namespace-prefix', 'conflict',
'connection-timeout', 'host-gone', 'host-unknown',
'improper-addressing', 'internal-server-error', 'invalid-from',
'invalid-namespace', 'invalid-xml', 'not-authorized',
'not-well-formed', 'policy-violation', 'remote-connection-failed',
'reset', 'resource-constraint', 'restricted-xml', 'see-other-host',
'system-shutdown', 'undefined-condition', 'unsupported-encoding',
'unsupported-feature', 'unsupported-stanza-type',
'unsupported-version'))
condition_ns = 'urn:ietf:params:xml:ns:xmpp-streams'