diff options
| author | Brian Jarrett <celttechie@gmail.com> | 2014-07-11 18:53:37 -0600 |
|---|---|---|
| committer | Brian Jarrett <celttechie@gmail.com> | 2014-07-12 11:57:43 -0600 |
| commit | 64f005309a0f1554ada3097d7a6e83aabc0f462e (patch) | |
| tree | 8dc57aef04a10d08e9529812cf0b8870c9a1263b | |
| parent | 61601648e34322917c0c92a83532c6880b690ad4 (diff) | |
| download | sqlalchemy-64f005309a0f1554ada3097d7a6e83aabc0f462e.tar.gz | |
changes to conform to PEP8 E711 break nose tests for orm/test_query.py and orm/test_joins.py -- reverting
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index ac5797df0..90e3085a0 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -1212,7 +1212,7 @@ class RelationshipProperty(StrategizedProperty): return sql.and_(*[ sql.or_( adapt(x) != state_bindparam(adapt(x), state, y), - adapt(x) is None) + adapt(x) == None) for (x, y) in self.property.local_remote_pairs]) criterion = sql.and_(*[x == y for (x, y) in @@ -1265,7 +1265,7 @@ class RelationshipProperty(StrategizedProperty): """ if isinstance(other, (util.NoneType, expression.Null)): if self.property.direction == MANYTOONE: - return sql.or_(*[x is not None for x in + return sql.or_(*[x != None for x in self.property._calculated_foreign_keys]) else: return self._criterion_exists() |