Merge branch 'master' into develop

2012-09-01 13:57:24 -07:00 · 2012-09-01 13:57:24 -07:00 · df9ac58d05
commit df9ac58d05
parent 19a78f63f4 357406d801
1 changed files with 4 additions and 1 deletions
--- 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):