diff options
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/exceptions.py | 1 | ||||
| -rw-r--r-- | sleekxmpp/stanza/atom.py | 33 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/__init__.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/matcher/__init__.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/stanzabase.py | 1 |
5 files changed, 28 insertions, 13 deletions
diff --git a/sleekxmpp/exceptions.py b/sleekxmpp/exceptions.py index 40217ef6..980c6b6e 100644 --- a/sleekxmpp/exceptions.py +++ b/sleekxmpp/exceptions.py @@ -6,6 +6,7 @@ See the file LICENSE for copying permission. """ + class XMPPError(Exception): """ diff --git a/sleekxmpp/stanza/atom.py b/sleekxmpp/stanza/atom.py index 9df85a2b..244ef315 100644 --- a/sleekxmpp/stanza/atom.py +++ b/sleekxmpp/stanza/atom.py @@ -1,11 +1,26 @@ -from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID -from xml.etree import cElementTree as ET +""" + 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 + class AtomEntry(ElementBase): - namespace = 'http://www.w3.org/2005/Atom' - name = 'entry' - plugin_attrib = 'entry' - interfaces = set(('title', 'summary')) - sub_interfaces = set(('title', 'summary')) - plugin_attrib_map = {} - plugin_tag_map = {} + + """ + A simple Atom feed entry. + + Stanza Interface: + title -- The title of the Atom feed entry. + summary -- The summary of the Atom feed entry. + """ + + namespace = 'http://www.w3.org/2005/Atom' + name = 'entry' + plugin_attrib = 'entry' + interfaces = set(('title', 'summary')) + sub_interfaces = set(('title', 'summary')) diff --git a/sleekxmpp/xmlstream/__init__.py b/sleekxmpp/xmlstream/__init__.py index fadefa20..09514958 100644 --- a/sleekxmpp/xmlstream/__init__.py +++ b/sleekxmpp/xmlstream/__init__.py @@ -14,6 +14,6 @@ from sleekxmpp.xmlstream.tostring import tostring from sleekxmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT from sleekxmpp.xmlstream.xmlstream import RestartStream -__all__ = ['JID', 'Scheduler', 'StanzaBase', 'ElementBase', - 'ET', 'StateMachine', 'tostring', 'XMLStream', +__all__ = ['JID', 'Scheduler', 'StanzaBase', 'ElementBase', + 'ET', 'StateMachine', 'tostring', 'XMLStream', 'RESPONSE_TIMEOUT', 'RestartStream'] diff --git a/sleekxmpp/xmlstream/matcher/__init__.py b/sleekxmpp/xmlstream/matcher/__init__.py index 86447b76..1038d1bd 100644 --- a/sleekxmpp/xmlstream/matcher/__init__.py +++ b/sleekxmpp/xmlstream/matcher/__init__.py @@ -12,5 +12,5 @@ from sleekxmpp.xmlstream.matcher.stanzapath import StanzaPath from sleekxmpp.xmlstream.matcher.xmlmask import MatchXMLMask from sleekxmpp.xmlstream.matcher.xpath import MatchXPath -__all__ = ['MatcherId', 'MatchMany', 'StanzaPath', +__all__ = ['MatcherId', 'MatchMany', 'StanzaPath', 'MatchXMLMask', 'MatchXPath'] diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index f8242005..f4a7e506 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -588,7 +588,6 @@ class ElementBase(object): if isinstance(xpath, str): xpath = self._fix_ns(xpath, split=True, propagate_ns=False) - # Extract the tag name and attribute checks for the first XPath node. components = xpath[0].split('@') tag = components[0] |