Merge lp:~jkakar/storm/sqlobject-is-empty into lp:storm

[Jamu Kakar]

This branch introduces the following changes:

- SQLObjectResultSet has a new is_empty method that behaves the same
  as the existing __nonzero__ method. It should be used in
  preference to __nonzero__ which isn't supported by ResultSet,
  whereas is_empty is.

[Stuart Bishop (stub)]

Looks good.

review: Approve

[Robert Collins (lifeless)]

Looks good to me too FWIW.

review: Approve

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2009-04-24 04:05:13 +0000
+++ storm/sqlobject.py	2010-08-02 17:55:59 +0000
@@ -552,6 +552,16 @@
         return item in result_set
 
     def __nonzero__(self):
+        """Return C{True} if this result set doesn't contain any results.
+
+        @note: This method is provided for compatibility with SQL Object.  For
+            new code, prefer L{is_empty}.  It's compatible with L{ResultSet}
+            which doesn't have a C{__nonzero__} implementation.
+        """
+        return self.is_empty()
+
+    def is_empty(self):
+        """Return C{True} if this result set doesn't contain any results."""
         result_set = self._without_prejoins()._result_set
         return not result_set.is_empty()
 

=== modified file 'storm/store.py'
--- storm/store.py	2010-07-23 09:44:39 +0000
+++ storm/store.py	2010-08-02 17:55:59 +0000
@@ -1046,7 +1046,7 @@
         return result.get_one() is not None
 
     def is_empty(self):
-        """Return true if this L{ResultSet} contains no results."""
+        """Return C{True} if this result set doesn't contain any results."""
         subselect = self._get_select()
         subselect.limit = 1
         subselect.order_by = Undef

=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2009-04-24 03:35:36 +0000
+++ tests/sqlobject.py	2010-08-02 17:55:59 +0000
@@ -783,11 +783,27 @@
         self.assertEquals(list(result.__iter__())[0].name, "John Joe")
 
     def test_result_set__nonzero__(self):
+        """
+        L{SQLObjectResultSet.__nonzero__} returns C{True} if the result set
+        doesn't contain any results.  If it does contain results, C{False} is
+        returned.
+        """
         result = self.Person.select()
         self.assertEquals(result.__nonzero__(), True)
         result = self.Person.select(self.Person.q.name == "No Person")
         self.assertEquals(result.__nonzero__(), False)
 
+    def test_result_set_is_empty(self):
+        """
+        L{SQLObjectResultSet.is_empty} returns C{True} if the result set
+        doesn't contain any results.  If it does contain results, C{False} is
+        returned.
+        """
+        result = self.Person.select()
+        self.assertEquals(result.is_empty(), True)
+        result = self.Person.select(self.Person.q.name == "No Person")
+        self.assertEquals(result.is_empty(), False)
+
     def test_result_set_distinct(self):
         result = self.Person.select("person.name = 'John Joe'",
                                     clauseTables=["phone"])