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

Remove unused RestartStream exception

Browse source
This commit is contained in:
Florent Le Coz 2014-07-22 02:18:48 +02:00
parent f5d4334963
commit d3b56a5d94
6 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/xmlstream/xmlstream.rst
View file

@ -4,7 +4,5 @@ XML Stream
.. module:: slixmpp.xmlstream.xmlstream .. module:: slixmpp.xmlstream.xmlstream
.. autoexception:: RestartStream
.. autoclass:: XMLStream .. autoclass:: XMLStream
:members: :members:

2
slixmpp/__init__.py
View file

@ -21,7 +21,7 @@ from slixmpp.stanza import Message, Presence, Iq
from slixmpp.jid import JID, InvalidJID from slixmpp.jid import JID, InvalidJID
from slixmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin from slixmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin
from slixmpp.xmlstream.handler import * from slixmpp.xmlstream.handler import *
from slixmpp.xmlstream import XMLStream, RestartStream from slixmpp.xmlstream import XMLStream
from slixmpp.xmlstream.matcher import * from slixmpp.xmlstream.matcher import *
from slixmpp.basexmpp import BaseXMPP from slixmpp.basexmpp import BaseXMPP
from slixmpp.clientxmpp import ClientXMPP from slixmpp.clientxmpp import ClientXMPP

2
slixmpp/features/feature_mechanisms/mechanisms.py
View file

@ -12,7 +12,7 @@ import logging
from slixmpp.util import sasl from slixmpp.util import sasl
from slixmpp.util.stringprep_profiles import StringPrepError from slixmpp.util.stringprep_profiles import StringPrepError
from slixmpp.stanza import StreamFeatures from slixmpp.stanza import StreamFeatures
from slixmpp.xmlstream import RestartStream, register_stanza_plugin from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin from slixmpp.plugins import BasePlugin
from slixmpp.xmlstream.matcher import MatchXPath from slixmpp.xmlstream.matcher import MatchXPath
from slixmpp.xmlstream.handler import Callback from slixmpp.xmlstream.handler import Callback

2
slixmpp/features/feature_starttls/starttls.py
View file

@ -9,7 +9,7 @@
import logging import logging
from slixmpp.stanza import StreamFeatures from slixmpp.stanza import StreamFeatures
from slixmpp.xmlstream import RestartStream, register_stanza_plugin from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin from slixmpp.plugins import BasePlugin
from slixmpp.xmlstream.matcher import MatchXPath from slixmpp.xmlstream.matcher import MatchXPath
from slixmpp.xmlstream.handler import Callback from slixmpp.xmlstream.handler import Callback

3
slixmpp/xmlstream/__init__.py
View file

@ -11,8 +11,7 @@ from slixmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET
from slixmpp.xmlstream.stanzabase import register_stanza_plugin from slixmpp.xmlstream.stanzabase import register_stanza_plugin
from slixmpp.xmlstream.tostring import tostring from slixmpp.xmlstream.tostring import tostring
from slixmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT from slixmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT
from slixmpp.xmlstream.xmlstream import RestartStream
__all__ = ['JID', 'StanzaBase', 'ElementBase', __all__ = ['JID', 'StanzaBase', 'ElementBase',
'ET', 'StateMachine', 'tostring', 'XMLStream', 'ET', 'StateMachine', 'tostring', 'XMLStream',
'RESPONSE_TIMEOUT', 'RestartStream'] 'RESPONSE_TIMEOUT']

6
slixmpp/xmlstream/xmlstream.py
View file

@ -47,12 +47,6 @@ RESPONSE_TIMEOUT = 30
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class RestartStream(Exception):
"""
Exception to restart stream processing, including
resending the stream header.
"""
class NotConnectedError(Exception): class NotConnectedError(Exception):
""" """
Raised when we try to send something over the wire but we are not Raised when we try to send something over the wire but we are not