diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2010-01-05 21:56:48 +0000 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2010-01-05 21:56:48 +0000 |
| commit | 093644ffbd6708121150c92359bce60408f924bb (patch) | |
| tree | a7d6da57ff76a8e54b1ec3703aeffeed82f34fa1 /sleekxmpp/basexmpp.py | |
| parent | 805afa4bc1f44598d786fddc92c5129c62464227 (diff) | |
| download | slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.gz slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.bz2 slixmpp-093644ffbd6708121150c92359bce60408f924bb.tar.xz slixmpp-093644ffbd6708121150c92359bce60408f924bb.zip | |
* major stanza improvements
* raise XMPPError in handler to reply with error stanza
* started work on pubsub stanzas
Diffstat (limited to 'sleekxmpp/basexmpp.py')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 8f32c8f5..dd77bfb0 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -18,6 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA """ from __future__ import with_statement + + from xml.etree import cElementTree as ET from . xmlstream.xmlstream import XMLStream from . xmlstream.matcher.xmlmask import MatchXMLMask @@ -32,6 +34,7 @@ from . stanza.presence import Presence from . stanza.roster import Roster from . stanza.nick import Nick from . stanza.htmlim import HTMLIM +from . stanza.error import Error import logging import threading @@ -91,6 +94,8 @@ class basexmpp(object): """Register a plugin not in plugins.__init__.__all__ but in the plugins directory.""" # discover relative "path" to the plugins module from the main app, and import it. + # TODO: + # gross, this probably isn't necessary anymore, especially for an installed module __import__("%s.%s" % (globals()['plugins'].__name__, plugin)) # init the plugin class self.plugin[plugin] = getattr(getattr(plugins, plugin), plugin)(self, pconfig) # eek |