diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-11-17 05:58:14 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-11-17 05:58:14 +0000 |
| commit | 82ef9efc42cea41e0f872ec85296b0be24548d06 (patch) | |
| tree | 7ce38b4ac4ca4dcdd26768c16a2d9dba3829bce5 /lib/sqlalchemy/attributes.py | |
| parent | 336ac3698000302f19670215cd9be7614893d1a9 (diff) | |
| download | sqlalchemy-82ef9efc42cea41e0f872ec85296b0be24548d06.tar.gz | |
brand new topological sort library. woop.
Diffstat (limited to 'lib/sqlalchemy/attributes.py')
| -rw-r--r-- | lib/sqlalchemy/attributes.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/attributes.py b/lib/sqlalchemy/attributes.py index 40c2cc195..f3fd1b558 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) |