- Removed conflicting `contains()` operator from

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

diff --git a/CHANGES b/CHANGES
index df3da1c96c0c814bd910c3ed80b99da494b06291..31dd9e71164b0358d2717543344b02e002e8a915 100644 (file)
--- 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 495d22be168bd2cee6c8663fad9dd250c1305943..631d3f5820b04f8b5c94e8268fe81cd9d588a462 100644 (file)
--- 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.