[SQL-CVS] r4203 - SQLObject/trunk/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-07-12 09:03:09 -0600 (Mon, 12 Jul 2010)
New Revision: 4203

Modified:
   SQLObject/trunk/sqlobject/col.py
Log:
Joined conditions.


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-07-12 14:52:52 UTC (rev 4202)
+++ SQLObject/trunk/sqlobject/col.py	2010-07-12 15:03:09 UTC (rev 4203)
@@ -660,10 +660,8 @@
             return None
         if isinstance(value, (bool, sqlbuilder.SQLExpression)):
             return value
-        if isinstance(value, (int, long)):
+        if isinstance(value, (int, long)) or hasattr(value, '__nonzero__'):
             return bool(value)
-        if hasattr(value, '__nonzero__'):
-            return bool(value)
         raise validators.Invalid("expected a bool or an int in the BoolCol '%s', got %s %r instead" % \
             (self.name, type(value), value), value, state)