diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/databases/mssql.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/collections.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 5fb4361b9..84f95fad9 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -1044,7 +1044,7 @@ class MSSQLCompiler(compiler.DefaultCompiler): and not isinstance(binary.right, expression._BindParamClause): return self.process(expression._BinaryExpression(binary.right, binary.left, binary.operator), **kwargs) else: - if (binary.operator in (operator.eq, operator.ne)) and ( + if (binary.operator is operator.eq or binary.operator is operator.ne) and ( (isinstance(binary.left, expression._FromGrouping) and isinstance(binary.left.element, expression._ScalarSelect)) or \ (isinstance(binary.right, expression._FromGrouping) and isinstance(binary.right.element, expression._ScalarSelect)) or \ isinstance(binary.left, expression._ScalarSelect) or isinstance(binary.right, expression._ScalarSelect)): diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py index 3c1c16b7d..5638a7e4a 100644 --- a/lib/sqlalchemy/orm/collections.py +++ b/lib/sqlalchemy/orm/collections.py @@ -99,7 +99,6 @@ through the adapter, allowing for some very sophisticated behavior. import copy import inspect import operator -import sets import sys import weakref @@ -1128,7 +1127,11 @@ def _dict_decorators(): l.pop('Unspecified') return l -_set_binop_bases = (set, frozenset, sets.BaseSet) +if util.py3k: + _set_binop_bases = (set, frozenset) +else: + import sets + _set_binop_bases = (set, frozenset, sets.BaseSet) def _set_binops_check_strict(self, obj): """Allow only set, frozenset and self.__class__-derived objects in binops.""" diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index a4ff72b1a..b7d4965dd 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2128,7 +2128,7 @@ class ClauseList(ClauseElement): return list(itertools.chain(*[c._from_objects for c in self.clauses])) def self_group(self, against=None): - if self.group and self.operator != against and operators.is_precedent(self.operator, against): + if self.group and self.operator is not against and operators.is_precedent(self.operator, against): return _Grouping(self) else: return self |