From 82ef9efc42cea41e0f872ec85296b0be24548d06 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 17 Nov 2005 05:58:14 +0000
Subject: [PATCH] brand new topological sort library. woop.

---
 lib/sqlalchemy/attributes.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/sqlalchemy/attributes.py b/lib/sqlalchemy/attributes.py
index 40c2cc1956..f3fd1b558a 100644
--- 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)
-- 
2.47.2