From cc0dcca7b4bf3ad05630c92012be715c6e515aaf Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 7 Sep 2008 01:31:01 +0000 Subject: [PATCH] - Removed conflicting `contains()` operator from `InstrumentedAttribute` which didn't accept `escape` kwaarg [ticket:1153]. --- CHANGES | 4 ++++ lib/sqlalchemy/orm/interfaces.py | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index df3da1c96c..31dd9e7116 100644 --- a/CHANGES +++ b/CHANGES @@ -116,6 +116,10 @@ CHANGES - The `echo_uow` flag on `Session` is deprecated, and unit-of-work logging is now application-level only, not per-session level. + - Removed conflicting `contains()` operator from + `InstrumentedAttribute` which didn't accept `escape` kwaarg + [ticket:1153]. + - declarative - Fixed bug whereby mapper couldn't initialize if a composite primary key referenced another table that was not defined diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 495d22be16..631d3f5820 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -441,10 +441,6 @@ class PropComparator(expression.ColumnOperators): def __clause_element__(self): raise NotImplementedError("%r" % self) - @staticmethod - def contains_op(a, b): - return a.contains(b) - @staticmethod def any_op(a, b, **kwargs): return a.any(b, **kwargs) @@ -480,10 +476,6 @@ class PropComparator(expression.ColumnOperators): return self.operate(PropComparator.of_type_op, class_) - def contains(self, other): - """Return true if this collection contains other""" - return self.operate(PropComparator.contains_op, other) - def any(self, criterion=None, **kwargs): """Return true if this collection contains any member that meets the given criterion. -- 2.47.3