From 412c80dd6c5d6b940e86e7e142aa1fdd6ee4466d Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Mon, 21 Jan 2008 23:19:39 +0000 Subject: - 2.3 fixup, part two: 100% passing for sqlite - added 2.4-style binops to util.Set on 2.3 - OrderedSets pickle on 2.3 - more lib/sqlalchemy set vs Set corrections - fixed InstrumentedSet.discard for 2.3 - set, sorted compatibility for test suite - added testing.fails_if decorator --- lib/sqlalchemy/ext/associationproxy.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/ext/associationproxy.py') diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py index fefc289f8..e9f604005 100644 --- a/lib/sqlalchemy/ext/associationproxy.py +++ b/lib/sqlalchemy/ext/associationproxy.py @@ -686,7 +686,7 @@ class _AssociationSet(object): self.add(value) def __ior__(self, other): - if util.duck_type_collection(other) is not set: + if util.duck_type_collection(other) is not util.Set: return NotImplemented for value in other: self.add(value) @@ -710,7 +710,7 @@ class _AssociationSet(object): self.discard(value) def __isub__(self, other): - if util.duck_type_collection(other) is not set: + if util.duck_type_collection(other) is not util.Set: return NotImplemented for value in other: self.discard(value) @@ -732,7 +732,7 @@ class _AssociationSet(object): self.add(value) def __iand__(self, other): - if util.duck_type_collection(other) is not set: + if util.duck_type_collection(other) is not util.Set: return NotImplemented want, have = self.intersection(other), util.Set(self) @@ -760,7 +760,7 @@ class _AssociationSet(object): self.add(value) def __ixor__(self, other): - if util.duck_type_collection(other) is not set: + if util.duck_type_collection(other) is not util.Set: return NotImplemented want, have = self.symmetric_difference(other), util.Set(self) -- cgit v1.2.1