summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza/stream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-01 14:45:55 -0700
committerLance Stout <lancestout@gmail.com>2011-07-01 14:45:55 -0700
commit634f5d691bab9855deddc4c201389bb60470d76e (patch)
tree29303420af94646ddac01824ebb4a201606b18e1 /sleekxmpp/stanza/stream
parent754ac5092a3a37819a71f6565a1e54b3f2547940 (diff)
downloadslixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.gz
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.bz2
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.tar.xz
slixmpp-634f5d691bab9855deddc4c201389bb60470d76e.zip
Continued reorganization and streamlining.
Diffstat (limited to 'sleekxmpp/stanza/stream')
-rw-r--r--sleekxmpp/stanza/stream/__init__.py5
-rw-r--r--sleekxmpp/stanza/stream/bind.py27
-rw-r--r--sleekxmpp/stanza/stream/error.py69
-rw-r--r--sleekxmpp/stanza/stream/features.py52
-rw-r--r--sleekxmpp/stanza/stream/sasl.py104
-rw-r--r--sleekxmpp/stanza/stream/session.py26
-rw-r--r--sleekxmpp/stanza/stream/tls.py50
7 files changed, 0 insertions, 333 deletions
diff --git a/sleekxmpp/stanza/stream/__init__.py b/sleekxmpp/stanza/stream/__init__.py
index a386bbac..2cb79673 100644
--- a/sleekxmpp/stanza/stream/__init__.py
+++ b/sleekxmpp/stanza/stream/__init__.py
@@ -6,8 +6,3 @@
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/stream/bind.py b/sleekxmpp/stanza/stream/bind.py
deleted file mode 100644
index 165afcb4..00000000
--- a/sleekxmpp/stanza/stream/bind.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
- 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 import Iq
-from sleekxmpp.stanza.stream import StreamFeatures
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
-
-
-class Bind(ElementBase):
-
- """
- """
-
- name = 'bind'
- namespace = 'urn:ietf:params:xml:ns:xmpp-bind'
- interfaces = set(('resource', 'jid'))
- sub_interfaces = interfaces
- plugin_attrib = 'bind'
-
-
-register_stanza_plugin(Iq, Bind)
-register_stanza_plugin(StreamFeatures, Bind)
diff --git a/sleekxmpp/stanza/stream/error.py b/sleekxmpp/stanza/stream/error.py
deleted file mode 100644
index cf59a7fa..00000000
--- a/sleekxmpp/stanza/stream/error.py
+++ /dev/null
@@ -1,69 +0,0 @@
-"""
- 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.error import Error
-from sleekxmpp.xmlstream import StanzaBase, ElementBase, ET
-from sleekxmpp.xmlstream import register_stanza_plugin
-
-
-class StreamError(Error, StanzaBase):
-
- """
- XMPP stanzas of type 'error' should include an <error> stanza that
- describes the nature of the error and how it should be handled.
-
- Use the 'XEP-0086: Error Condition Mappings' plugin to include error
- codes used in older XMPP versions.
-
- The stream:error stanza is used to provide more information for
- error that occur with the underlying XML stream itself, and not
- a particular stanza.
-
- Note: The StreamError stanza is mostly the same as the normal
- Error stanza, but with different namespaces and
- condition names.
-
- Example error stanza:
- <stream:error>
- <not-well-formed xmlns="urn:ietf:params:xml:ns:xmpp-streams" />
- <text xmlns="urn:ietf:params:xml:ns:xmpp-streams">
- XML was not well-formed.
- </text>
- </stream:error>
-
- Stanza Interface:
- condition -- The name of the condition element.
- text -- Human readable description of the error.
-
- Attributes:
- conditions -- The set of allowable error condition elements.
- condition_ns -- The namespace for the condition element.
-
- Methods:
- setup -- Overrides ElementBase.setup.
- get_condition -- Retrieve the name of the condition element.
- set_condition -- Add a condition element.
- del_condition -- Remove the condition element.
- get_text -- Retrieve the contents of the <text> element.
- set_text -- Set the contents of the <text> element.
- del_text -- Remove the <text> element.
- """
-
- 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'
diff --git a/sleekxmpp/stanza/stream/features.py b/sleekxmpp/stanza/stream/features.py
deleted file mode 100644
index 5be2e55f..00000000
--- a/sleekxmpp/stanza/stream/features.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
- 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.xmlstream import ElementBase, StanzaBase, ET
-from sleekxmpp.xmlstream import register_stanza_plugin
-
-
-class StreamFeatures(StanzaBase):
-
- """
- """
-
- name = 'features'
- namespace = 'http://etherx.jabber.org/streams'
- interfaces = set(('features', 'required', 'optional'))
- sub_interfaces = interfaces
-
- def setup(self, xml):
- StanzaBase.setup(self, xml)
- self.values = self.values
-
- def get_features(self):
- """
- """
- return self.plugins
-
- def set_features(self, value):
- """
- """
- pass
-
- def del_features(self):
- """
- """
- pass
-
- def get_required(self):
- """
- """
- features = self['features']
- return [f for n, f in features.items() if f['required']]
-
- def get_optional(self):
- """
- """
- features = self['features']
- return [f for n, f in features.items() if not f['required']]
diff --git a/sleekxmpp/stanza/stream/sasl.py b/sleekxmpp/stanza/stream/sasl.py
deleted file mode 100644
index e55a72ad..00000000
--- a/sleekxmpp/stanza/stream/sasl.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
- 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 import StreamFeatures
-from sleekxmpp.xmlstream import ElementBase, StanzaBase, ET
-from sleekxmpp.xmlstream import register_stanza_plugin
-
-
-class Mechanisms(ElementBase):
-
- """
- """
-
- name = 'mechanisms'
- namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
- interfaces = set(('mechanisms', 'required'))
- plugin_attrib = name
- is_extension = True
-
- def get_required(self):
- """
- """
- return True
-
- def get_mechanisms(self):
- """
- """
- results = []
- mechs = self.findall('{%s}mechanism' % self.namespace)
- if mechs:
- for mech in mechs:
- results.append(mech.text)
- return results
-
- def set_mechanisms(self, values):
- """
- """
- self.del_mechanisms()
- for val in values:
- mech = ET.Element('{%s}mechanism' % self.namespace)
- mech.text = val
- self.append(mech)
-
- def del_mechanisms(self):
- """
- """
- mechs = self.findall('{%s}mechanism' % self.namespace)
- if mechs:
- for mech in mechs:
- self.xml.remove(mech)
-
-
-class Success(StanzaBase):
-
- """
- """
-
- name = 'success'
- namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
- interfaces = set()
- plugin_attrib = name
-
-
-class Failure(StanzaBase):
-
- """
- """
-
- name = 'failure'
- namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
- interfaces = set()
- plugin_attrib = name
-
-
-class Auth(StanzaBase):
-
- """
- """
-
- name = 'auth'
- namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
- interfaces = set(('mechanism', 'value'))
- plugin_attrib = name
-
- def setup(self, xml):
- StanzaBase.setup(self, xml)
- self.xml.tag = self.tag_name()
-
- def set_value(self, value):
- self.xml.text = value
-
- def get_value(self):
- return self.xml.text
-
- def del_value(self):
- self.xml.text = ''
-
-
-register_stanza_plugin(StreamFeatures, Mechanisms)
diff --git a/sleekxmpp/stanza/stream/session.py b/sleekxmpp/stanza/stream/session.py
deleted file mode 100644
index 87f21857..00000000
--- a/sleekxmpp/stanza/stream/session.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
- 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 import Iq
-from sleekxmpp.stanza.stream import StreamFeatures
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
-
-
-class Session(ElementBase):
-
- """
- """
-
- name = 'session'
- namespace = 'urn:ietf:params:xml:ns:xmpp-session'
- interfaces = set()
- plugin_attrib = 'session'
-
-
-register_stanza_plugin(Iq, Session)
-register_stanza_plugin(StreamFeatures, Session)
diff --git a/sleekxmpp/stanza/stream/tls.py b/sleekxmpp/stanza/stream/tls.py
deleted file mode 100644
index d85f9b49..00000000
--- a/sleekxmpp/stanza/stream/tls.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
- 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 import StreamFeatures
-from sleekxmpp.xmlstream import StanzaBase, ElementBase
-from sleekxmpp.xmlstream import register_stanza_plugin
-
-
-class STARTTLS(ElementBase):
-
- """
- """
-
- name = 'starttls'
- namespace = 'urn:ietf:params:xml:ns:xmpp-tls'
- interfaces = set(('required',))
- plugin_attrib = name
-
- def get_required(self):
- """
- """
- return True
-
-
-class Proceed(StanzaBase):
-
- """
- """
-
- name = 'proceed'
- namespace = 'urn:ietf:params:xml:ns:xmpp-tls'
- interfaces = set()
-
-
-class Failure(StanzaBase):
-
- """
- """
-
- name = 'failure'
- namespace = 'urn:ietf:params:xml:ns:xmpp-tls'
- interfaces = set()
-
-
-register_stanza_plugin(StreamFeatures, STARTTLS)