summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-11-15 15:10:05 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-11-15 15:10:05 +0000
commite076169d390df8a9e90aa46053db34fd5815598a (patch)
tree0f39618de4a792d4fbf9e169795817c63c418580 /lib/sqlalchemy
parentd5da9a56bc0759fd8c6b3ed9732ca6f28f6dcfb4 (diff)
downloadsqlalchemy-e076169d390df8a9e90aa46053db34fd5815598a.tar.gz
fixed further issues with row translation [ticket:868]
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 2418d1324..55d4db98f 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -252,7 +252,10 @@ def create_row_adapter(from_, to, equivalent_columns=None):
def __init__(self, row):
self.row = row
def __contains__(self, key):
- return key in self.row or (key in map and map[key] in self.row)
+ if key in map:
+ return map[key] in self.row
+ else:
+ return key in self.row
def has_key(self, key):
return key in self
def __getitem__(self, key):