Reorganized stream level stanzas.

sleekxmpp/clientxmpp.py

@@ -19,8 +19,7 @@ from sleekxmpp import plugins
 from sleekxmpp import stanza
 from sleekxmpp.basexmpp import BaseXMPP
 from sleekxmpp.stanza import *
-from sleekxmpp.stanza import tls
+from sleekxmpp.stanza.stream import tls, sasl
-from sleekxmpp.stanza import sasl
 from sleekxmpp.xmlstream import XMLStream, RestartStream
 from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin
 from sleekxmpp.xmlstream.matcher import *

sleekxmpp/stanza/__init__.py

@@ -8,11 +8,10 @@
 
 
 from sleekxmpp.stanza.error import Error
-from sleekxmpp.stanza.stream_error import StreamError
 from sleekxmpp.stanza.iq import Iq
 from sleekxmpp.stanza.message import Message
 from sleekxmpp.stanza.presence import Presence
-from sleekxmpp.stanza.stream_features import StreamFeatures
+from sleekxmpp.stanza.stream import StreamFeatures
-from sleekxmpp.stanza.bind import Bind
+from sleekxmpp.stanza.stream import Bind
-from sleekxmpp.stanza.session import Session
+from sleekxmpp.stanza.stream import Session
-
+from sleekxmpp.stanza.stream import StreamError

sleekxmpp/stanza/stream/__init__.py

@@ -0,0 +1,13 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2010  Nathanael C. Fritz
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+
+from sleekxmpp.stanza.stream.error import StreamError
+from sleekxmpp.stanza.stream.features import StreamFeatures
+from sleekxmpp.stanza.stream.bind import Bind
+from sleekxmpp.stanza.stream.session import Session

sleekxmpp/stanza/stream/bind.py

@@ -6,7 +6,8 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import Iq
+from sleekxmpp.stanza.stream import StreamFeatures
 from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
 
 

sleekxmpp/stanza/stream/session.py

@@ -6,7 +6,8 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import Iq
+from sleekxmpp.stanza.stream import StreamFeatures
 from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin