brand new topological sort library. woop.

diff --git a/lib/sqlalchemy/attributes.py b/lib/sqlalchemy/attributes.py
index 40c2cc1956036109bf6e792ebe5cf91ea1975363..f3fd1b558a25eb0a984c2519672d4a180de118c1 100644 (file)
--- a/lib/sqlalchemy/attributes.py
+++ b/lib/sqlalchemy/attributes.py
@@ -147,8 +147,9 @@ class CallableProp(object):
         if not self.uselist:
             if self.obj.__dict__.get(self.key, None) is None:
                 if passive:
-                    return None
-                value = self.callable_()
+                    value = None
+                else:
+                    value = self.callable_()
                 self.obj.__dict__[self.key] = value
 
             p = PropHistory(self.obj, self.key, **self.kwargs)