Merge lp:~jtv/storm/bug-659078 into lp:storm

[Jeroen T. Vermeulen]

SQLObject "is_empty" was inverted.

See bug 659078. It was Brad who did the work on this one; I just put it into code to help the fix along.

[Jamu Kakar (jkakar)]

Looks good to me, +1!

review: Approve

[Björn Tillenius (bjornt)]

+1!

review: Approve

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2010-08-05 19:43:41 +0000
+++ storm/sqlobject.py	2010-10-12 12:06:44 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2007 Canonical
+# Copyright (c) 2006-2010 Canonical
 #
 # Written by Gustavo Niemeyer <[e-mail]>
 #
@@ -558,12 +558,12 @@
             new code, prefer L{is_empty}.  It's compatible with L{ResultSet}
             which doesn't have a C{__nonzero__} implementation.
         """
-        return self.is_empty()
+        return not 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()
+        return result_set.is_empty()
 
     def count(self):
         result_set = self._without_prejoins()._result_set

=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2010-08-02 17:52:46 +0000
+++ tests/sqlobject.py	2010-10-12 12:06:44 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2007 Canonical
+# Copyright (c) 2006-2010 Canonical
 #
 # Written by Gustavo Niemeyer <[e-mail]>
 #
@@ -25,7 +25,6 @@
 from storm.exceptions import NoneError
 from storm.sqlobject import *
 from storm.store import Store
-from storm.expr import Asc, Like
 from storm.tz import tzutc
 
 from tests.helper import TestHelper
@@ -785,7 +784,7 @@
     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
+        contains results.  If it contains no results, C{False} is
         returned.
         """
         result = self.Person.select()
@@ -800,9 +799,9 @@
         returned.
         """
         result = self.Person.select()
+        self.assertEquals(result.is_empty(), False)
+        result = self.Person.select(self.Person.q.name == "No Person")
         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'",