diff options
| -rw-r--r-- | docs/api/xmlstream/xmlstream.rst | 2 | ||||
| -rw-r--r-- | slixmpp/__init__.py | 2 | ||||
| -rw-r--r-- | slixmpp/features/feature_mechanisms/mechanisms.py | 2 | ||||
| -rw-r--r-- | slixmpp/features/feature_starttls/starttls.py | 2 | ||||
| -rw-r--r-- | slixmpp/xmlstream/__init__.py | 3 | ||||
| -rw-r--r-- | slixmpp/xmlstream/xmlstream.py | 6 |
6 files changed, 4 insertions, 13 deletions
diff --git a/docs/api/xmlstream/xmlstream.rst b/docs/api/xmlstream/xmlstream.rst index ced2ed14..539e03ca 100644 --- a/docs/api/xmlstream/xmlstream.rst +++ b/docs/api/xmlstream/xmlstream.rst @@ -4,7 +4,5 @@ XML Stream .. module:: slixmpp.xmlstream.xmlstream -.. autoexception:: RestartStream - .. autoclass:: XMLStream :members: diff --git a/slixmpp/__init__.py b/slixmpp/__init__.py index faf9dad6..0a157211 100644 --- a/slixmpp/__init__.py +++ b/slixmpp/__init__.py @@ -21,7 +21,7 @@ from slixmpp.stanza import Message, Presence, Iq from slixmpp.jid import JID, InvalidJID from slixmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin from slixmpp.xmlstream.handler import * -from slixmpp.xmlstream import XMLStream, RestartStream +from slixmpp.xmlstream import XMLStream from slixmpp.xmlstream.matcher import * from slixmpp.basexmpp import BaseXMPP from slixmpp.clientxmpp import ClientXMPP diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py index 00dd481c..ee7db41e 100644 --- a/slixmpp/features/feature_mechanisms/mechanisms.py +++ b/slixmpp/features/feature_mechanisms/mechanisms.py @@ -12,7 +12,7 @@ import logging from slixmpp.util import sasl from slixmpp.util.stringprep_profiles import StringPrepError 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.xmlstream.matcher import MatchXPath from slixmpp.xmlstream.handler import Callback diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py index 5aad8ed4..d472dad7 100644 --- a/slixmpp/features/feature_starttls/starttls.py +++ b/slixmpp/features/feature_starttls/starttls.py @@ -9,7 +9,7 @@ import logging 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.xmlstream.matcher import MatchXPath from slixmpp.xmlstream.handler import Callback diff --git a/slixmpp/xmlstream/__init__.py b/slixmpp/xmlstream/__init__.py index fa192265..b9ab6dea 100644 --- a/slixmpp/xmlstream/__init__.py +++ b/slixmpp/xmlstream/__init__.py @@ -11,8 +11,7 @@ from slixmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET from slixmpp.xmlstream.stanzabase import register_stanza_plugin from slixmpp.xmlstream.tostring import tostring from slixmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT -from slixmpp.xmlstream.xmlstream import RestartStream __all__ = ['JID', 'StanzaBase', 'ElementBase', 'ET', 'StateMachine', 'tostring', 'XMLStream', - 'RESPONSE_TIMEOUT', 'RestartStream'] + 'RESPONSE_TIMEOUT'] diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index 9c0acaa7..1540ae7a 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -47,12 +47,6 @@ RESPONSE_TIMEOUT = 30 log = logging.getLogger(__name__) -class RestartStream(Exception): - """ - Exception to restart stream processing, including - resending the stream header. - """ - class NotConnectedError(Exception): """ Raised when we try to send something over the wire but we are not |