Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

1 files changed, 16 insertions, 4 deletions

diff --git a/sleekxmpp/roster/single.py b/sleekxmpp/roster/single.py
index deb1ac8b..c2a73d34 100644
--- a/sleekxmpp/roster/single.py
+++ b/sleekxmpp/roster/single.py
@@ -75,6 +75,10 @@ class RosterNode(object):
             self.add(key, save=True)
         return self._jids[key]
 
+    def __len__(self):
+        """Return the number of JIDs referenced by the roster."""
+        return len(self._jids)
+
     def keys(self):
         """Return a list of all subscribed JIDs."""
         return self._jids.keys()
@@ -83,6 +87,16 @@ class RosterNode(object):
         """Returns whether the roster has a JID."""
         return jid in self._jids
 
+    def groups(self):
+        """Return a dictionary mapping group names to JIDs."""
+        result = {}
+        for jid in self._jids:
+            for group in self._jids[jid]['groups']:
+                if group not in result:
+                    result[group] = []
+                result[group].append(jid)
+        return result
+
     def __iter__(self):
         """Iterate over the roster items."""
         return self._jids.__iter__()
@@ -204,10 +218,8 @@ class RosterNode(object):
             iq['roster']['items'] = {jid: {'name': name,
                                            'subscription': subscription,
                                            'groups': groups}}
-            response = iq.send(block, timeout, callback)
-            if response in [False, None] or isinstance(response, Iq):
-                return response
-            return response and response['type'] == 'result'
+
+            return iq.send(block, timeout, callback)
 
     def presence(self, jid, resource=None):
         """