Merge lp:~lifeless/storm/bug-759384 into lp:storm

[Robert Collins]

Add a missing declaration to the ISQLObjectResultSet interface and fix a typo on __nonzero__.

[Thomas Herve (therve)]

Looks good, +1!

review: Approve

[Jamu Kakar (jkakar)]

Nice work, +1!

review: Approve

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2010-10-12 12:02:01 +0000
+++ storm/sqlobject.py	2011-04-13 03:21:32 +0000
@@ -552,7 +552,7 @@
         return item in result_set
 
     def __nonzero__(self):
-        """Return C{True} if this result set doesn't contain any results.
+        """Return C{True} if this result set contains 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}

=== modified file 'storm/zope/interfaces.py'
--- storm/zope/interfaces.py	2011-03-15 07:54:00 +0000
+++ storm/zope/interfaces.py	2011-04-13 03:21:32 +0000
@@ -164,9 +164,14 @@
        """Return the number of items in the result set."""
 
     def __nonzero__():
-       """Boolean emulation."""
-
-    def __contains__():
+        """Return C{True} if this result set contains 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.
+        """
+
+    def __contains__(item):
        """Support C{if FooObject in Foo.select(query)}."""
 
     def intersect(otherSelect, intersectAll=False, orderBy=None):
@@ -177,6 +182,9 @@
         @param orderBy: the order the result set should use.
         """
 
+    def is_empty():
+        """Return C{True} if this result set doesn't contain any results."""
+
     def prejoin(prejoins):
        """Return a new L{SelectResults} with the list of attributes prejoined.