Fix: #27 return None if findWhere returns nothing.

tmuxp/testsuite/test_tmuxobject.py

@@ -13,7 +13,7 @@
 import random
 from .. import Pane, Window, Session
 from . import t
-from .helpers import TmuxTestCase
+from .helpers import TmuxTestCase, TEST_SESSION_PREFIX
 
 import logging
 
@@ -58,6 +58,21 @@ def test_findWhere(self):
                     self.assertIsInstance(window.findWhere(
                         {'pane_id': pane_id}), Pane)
 
+    def test_findWhere_None(self):
+        """.findWhere returns None if no results found."""
+
+        while True:
+            nonexistant_session = TEST_SESSION_PREFIX + str(
+                random.randint(0, 9999)
+            )
+
+            if not t.has_session(nonexistant_session):
+                break
+
+        self.assertIsNone(t.findWhere({
+            'session_name': nonexistant_session
+        }))
+
     def test_findWhere_multiple_attrs(self):
         """.findWhere returns objects with multiple attributes."""
 

tmuxp/util.py

@@ -156,7 +156,10 @@ def findWhere(self, attrs):
         .. _underscore.js: http://underscorejs.org/
 
         """
-        return self.where(attrs)[0] or None
+        try:
+            return self.where(attrs)[0]
+        except IndexError:
+            return None
 
     def where(self, attrs, first=False):
         """Return objects matching child objects properties.