- Removed conflicting `contains()` operator from

`InstrumentedAttribute` which didn't accept `escape` kwaarg
[ticket:1153].

2 files changed, 4 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index df3da1c96..31dd9e711 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 495d22be1..631d3f582 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -442,10 +442,6 @@ class PropComparator(expression.ColumnOperators):
         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.