summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-01 13:57:24 -0700
committerLance Stout <lancestout@gmail.com>2012-09-01 13:57:24 -0700
commitdf9ac58d051e195143875e03ce09a3994ade0e00 (patch)
treebcead3c0efffa670d2de0dc889aa0708e8ba9446
parent19a78f63f4a24d7a5ff568608d4323f773d785e2 (diff)
parent357406d801dabcac70d2794ac4c61c70655e704b (diff)
downloadslixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.gz
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.bz2
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.xz
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.zip
Merge branch 'master' into develop
-rw-r--r--sleekxmpp/stanza/roster.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/roster.py b/sleekxmpp/stanza/roster.py
index a415c482..681efd4f 100644
--- a/sleekxmpp/stanza/roster.py
+++ b/sleekxmpp/stanza/roster.py
@@ -130,7 +130,10 @@ class RosterItem(ElementBase):
def get_groups(self):
groups = []
for group in self.xml.findall('{%s}group' % self.namespace):
- groups.append(group.text)
+ if group.text:
+ groups.append(group.text)
+ else:
+ groups.append('')
return groups
def set_groups(self, values):