Merge pull request #27 from pdecat/master

Avoid KeyError when no room exists

socketio/base_manager.py

@@ -83,9 +83,12 @@ class BaseManager(object):
     def get_rooms(self, sid, namespace):
         """Return the rooms a client is in."""
         r = []
-        for room_name, room in six.iteritems(self.rooms[namespace]):
+        try:
-            if room_name is not None and sid in room and room[sid]:
+            for room_name, room in six.iteritems(self.rooms[namespace]):
-                r.append(room_name)
+                if room_name is not None and sid in room and room[sid]:
+                    r.append(room_name)
+        except KeyError:
+            pass
         return r
 
     def emit(self, event, data, namespace, room=None, skip_sid=None,

tests/test_base_manager.py

@@ -131,6 +131,10 @@ class TestBaseManager(unittest.TestCase):
         self.bm.leave_room('123', '/foo', 'baz')
         self.bm.leave_room('123', '/bar', 'baz')
 
+    def test_no_room(self):
+        rooms = self.bm.get_rooms('123', '/foo')
+        self.assertEqual([], rooms)
+
     def test_close_room(self):
         self.bm.connect('123', '/foo')
         self.bm.connect('456', '/foo')