summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sleekxmpp/clientxmpp.py3
-rw-r--r--sleekxmpp/stanza/__init__.py9
-rw-r--r--sleekxmpp/stanza/stream/__init__.py13
-rw-r--r--sleekxmpp/stanza/stream/bind.py (renamed from sleekxmpp/stanza/bind.py)3
-rw-r--r--sleekxmpp/stanza/stream/error.py (renamed from sleekxmpp/stanza/stream_error.py)0
-rw-r--r--sleekxmpp/stanza/stream/features.py (renamed from sleekxmpp/stanza/stream_features.py)0
-rw-r--r--sleekxmpp/stanza/stream/sasl.py (renamed from sleekxmpp/stanza/sasl.py)0
-rw-r--r--sleekxmpp/stanza/stream/session.py (renamed from sleekxmpp/stanza/session.py)3
-rw-r--r--sleekxmpp/stanza/stream/tls.py (renamed from sleekxmpp/stanza/tls.py)0
9 files changed, 22 insertions, 9 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 3a5f41bd..ea9654a6 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/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 import sasl
+from sleekxmpp.stanza.stream import tls, sasl
from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream import StanzaBase, ET, register_stanza_plugin
from sleekxmpp.xmlstream.matcher import *
diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py
index 4481fa42..05df8837 100644
--- a/sleekxmpp/stanza/__init__.py
+++ b/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.bind import Bind
-from sleekxmpp.stanza.session import Session
-
+from sleekxmpp.stanza.stream import StreamFeatures
+from sleekxmpp.stanza.stream import Bind
+from sleekxmpp.stanza.stream import Session
+from sleekxmpp.stanza.stream import StreamError
diff --git a/sleekxmpp/stanza/stream/__init__.py b/sleekxmpp/stanza/stream/__init__.py
new file mode 100644
index 00000000..a386bbac
--- /dev/null
+++ b/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
diff --git a/sleekxmpp/stanza/bind.py b/sleekxmpp/stanza/stream/bind.py
index ae1f96f0..165afcb4 100644
--- a/sleekxmpp/stanza/bind.py
+++ b/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
diff --git a/sleekxmpp/stanza/stream_error.py b/sleekxmpp/stanza/stream/error.py
index cf59a7fa..cf59a7fa 100644
--- a/sleekxmpp/stanza/stream_error.py
+++ b/sleekxmpp/stanza/stream/error.py
diff --git a/sleekxmpp/stanza/stream_features.py b/sleekxmpp/stanza/stream/features.py
index 5be2e55f..5be2e55f 100644
--- a/sleekxmpp/stanza/stream_features.py
+++ b/sleekxmpp/stanza/stream/features.py
diff --git a/sleekxmpp/stanza/sasl.py b/sleekxmpp/stanza/stream/sasl.py
index e55a72ad..e55a72ad 100644
--- a/sleekxmpp/stanza/sasl.py
+++ b/sleekxmpp/stanza/stream/sasl.py
diff --git a/sleekxmpp/stanza/session.py b/sleekxmpp/stanza/stream/session.py
index c9d97157..87f21857 100644
--- a/sleekxmpp/stanza/session.py
+++ b/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
diff --git a/sleekxmpp/stanza/tls.py b/sleekxmpp/stanza/stream/tls.py
index d85f9b49..d85f9b49 100644
--- a/sleekxmpp/stanza/tls.py
+++ b/sleekxmpp/stanza/stream/tls.py