diff options
Diffstat (limited to 'lib/sqlalchemy/util.py')
| -rw-r--r-- | lib/sqlalchemy/util.py | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py index 705168d20..3e26217c9 100644 --- a/lib/sqlalchemy/util.py +++ b/lib/sqlalchemy/util.py @@ -488,26 +488,30 @@ class OrderedSet(Set): __or__ = union def intersection(self, other): - return self.__class__([a for a in self if a in other]) + other = Set(other) + return self.__class__([a for a in self if a in other]) __and__ = intersection def symmetric_difference(self, other): - result = self.__class__([a for a in self if a not in other]) - result.update([a for a in other if a not in self]) - return result + other = Set(other) + result = self.__class__([a for a in self if a not in other]) + result.update([a for a in other if a not in self]) + return result __xor__ = symmetric_difference def difference(self, other): - return self.__class__([a for a in self if a not in other]) + other = Set(other) + return self.__class__([a for a in self if a not in other]) __sub__ = difference def intersection_update(self, other): - Set.intersection_update(self, other) - self._list = [ a for a in self._list if a in other] - return self + other = Set(other) + Set.intersection_update(self, other) + self._list = [ a for a in self._list if a in other] + return self __iand__ = intersection_update @@ -520,9 +524,9 @@ class OrderedSet(Set): __ixor__ = symmetric_difference_update def difference_update(self, other): - Set.difference_update(self, other) - self._list = [ a for a in self._list if a in self] - return self + Set.difference_update(self, other) + self._list = [ a for a in self._list if a in self] + return self __isub__ = difference_update @@ -536,6 +540,7 @@ class IdentitySet(object): def __init__(self, iterable=None): self._members = _IterableUpdatableDict() + self._tempset = Set if iterable: for o in iterable: self.add(o) @@ -625,7 +630,7 @@ class IdentitySet(object): result = type(self)() # testlib.pragma exempt:__hash__ result._members.update( - Set(self._members.iteritems()).union(_iter_id(iterable))) + self._tempset(self._members.iteritems()).union(_iter_id(iterable))) return result def __or__(self, other): @@ -647,7 +652,7 @@ class IdentitySet(object): result = type(self)() # testlib.pragma exempt:__hash__ result._members.update( - Set(self._members.iteritems()).difference(_iter_id(iterable))) + self._tempset(self._members.iteritems()).difference(_iter_id(iterable))) return result def __sub__(self, other): @@ -669,7 +674,7 @@ class IdentitySet(object): result = type(self)() # testlib.pragma exempt:__hash__ result._members.update( - Set(self._members.iteritems()).intersection(_iter_id(iterable))) + self._tempset(self._members.iteritems()).intersection(_iter_id(iterable))) return result def __and__(self, other): @@ -691,7 +696,7 @@ class IdentitySet(object): result = type(self)() # testlib.pragma exempt:__hash__ result._members.update( - Set(self._members.iteritems()).symmetric_difference(_iter_id(iterable))) + self._tempset(self._members.iteritems()).symmetric_difference(_iter_id(iterable))) return result def __xor__(self, other): @@ -749,6 +754,7 @@ class OrderedIdentitySet(IdentitySet): def __init__(self, iterable=None): IdentitySet.__init__(self) self._members = OrderedDict() + self._tempset = OrderedSet if iterable: for o in iterable: self.add(o) |