diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-09-09 15:51:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-09-09 15:51:40 -0400 |
| commit | 1492cc634ee67afb5ad03f0d56caca9fc3bbcc0e (patch) | |
| tree | 5ca87a8d50adc65bd6971d6843b2fe85420bb7a9 /lib/sqlalchemy/orm/attributes.py | |
| parent | 07179d2aae12bb4e72eb1e494a870eefada8320a (diff) | |
| download | sqlalchemy-1492cc634ee67afb5ad03f0d56caca9fc3bbcc0e.tar.gz | |
- Fixed bug whereby if __eq__() was
redefined, a relationship many-to-one lazyload
would hit the __eq__() and fail. [ticket:2260]
Does not apply to 0.6.9.
Diffstat (limited to 'lib/sqlalchemy/orm/attributes.py')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index a24348c86..42fdf7e7f 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -421,7 +421,7 @@ class AttributeImpl(object): else: value = ATTR_EMPTY - if value in (PASSIVE_NO_RESULT, NEVER_SET): + if value is PASSIVE_NO_RESULT or value is NEVER_SET: return value elif value is ATTR_WAS_SET: try: |