summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-05-25 10:33:24 +0800
committerThom Nichols <tmnichols@gmail.com>2010-06-01 22:07:51 +0800
commit8b3b8aca9ef3dc4215a0eb528259a5fd6f7137ea (patch)
tree19a25140d5ba7d1ccce77e765433352e7ea67b05
parente00dea7c0cc8d973aeebcfdb045c82923d0acdef (diff)
downloadslixmpp-8b3b8aca9ef3dc4215a0eb528259a5fd6f7137ea.tar.gz
slixmpp-8b3b8aca9ef3dc4215a0eb528259a5fd6f7137ea.tar.bz2
slixmpp-8b3b8aca9ef3dc4215a0eb528259a5fd6f7137ea.tar.xz
slixmpp-8b3b8aca9ef3dc4215a0eb528259a5fd6f7137ea.zip
updated README, index fix for component
-rw-r--r--README8
-rwxr-xr-xsleekxmpp/componentxmpp.py4
-rw-r--r--sleekxmpp/plugins/stanza_pubsub.py2
3 files changed, 9 insertions, 5 deletions
diff --git a/README b/README
index a6989090..670ce3cd 100644
--- a/README
+++ b/README
@@ -1,5 +1,8 @@
-SleekXMPP is an XMPP library written for Python 3.x (with 2.6 compatibility).
+SleekXMPP is an XMPP library written for Python 3.1+ (with 2.6 compatibility).
+Hosted at http://wiki.github.com/fritzy/SleekXMPP/
+
Featured in examples in XMPP: The Definitive Guide by Kevin Smith, Remko Tronçon, and Peter Saint-Andre
+If you're coming here from The Definitive Guide, please read http://wiki.github.com/fritzy/SleekXMPP/xmpp-the-definitive-guide
SleekXMPP has several design goals/philosophies:
- Low number of dependencies.
@@ -31,7 +34,8 @@ Since 0.2, here's the Changelog:
Credits
----------------
Main Author: Nathan Fritz fritz@netflint.net
-XEP-0045 original implementation: Kevin Smith
+Contributors: Kevin Smith & Lance Stout
Patches: Remko Tronçon
Feel free to add fritzy@netflint.net to your roster for direct support and comments.
+Join sleekxmpp-discussion@googlegroups.com / http://groups.google.com/group/sleekxmpp-discussion for discussion.
diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py
index 89953687..de125814 100755
--- a/sleekxmpp/componentxmpp.py
+++ b/sleekxmpp/componentxmpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python2.6
"""
SleekXMPP: The Sleek XMPP Library
@@ -54,7 +54,7 @@ class ComponentXMPP(basexmpp, XMLStream):
self.secret = secret
self.registerHandler(Callback('Handshake', MatchXPath('{jabber:component:accept}handshake'), self._handleHandshake))
- def __getitem__(self, key):
+ def __getitem__(self, key):
if key in self.plugin:
return self.plugin[key]
else:
diff --git a/sleekxmpp/plugins/stanza_pubsub.py b/sleekxmpp/plugins/stanza_pubsub.py
index 4187d49c..1dd73d99 100644
--- a/sleekxmpp/plugins/stanza_pubsub.py
+++ b/sleekxmpp/plugins/stanza_pubsub.py
@@ -281,7 +281,7 @@ class DefaultConfig(ElementBase):
def getType(self):
t = self._getAttr('type')
- if not t: t == 'leaf'
+ if not t: t = 'leaf'
return t
stanzaPlugin(PubsubOwner, DefaultConfig)