##// END OF EJS Templates
addset: drop caching through generatorset...
Pierre-Yves David -
r22799:bafa371d default
parent child Browse files
Show More
@@ -2499,7 +2499,6 class addset(abstractsmartset):
2499 If the ascending attribute is set, iterate over both collections at the
2499 If the ascending attribute is set, iterate over both collections at the
2500 same time, yielding only one value at a time in the given order.
2500 same time, yielding only one value at a time in the given order.
2501 """
2501 """
2502 if not self._iter:
2503 if self._ascending is None:
2502 if self._ascending is None:
2504 def gen():
2503 def gen():
2505 for r in self._r1:
2504 for r in self._r1:
@@ -2513,8 +2512,7 class addset(abstractsmartset):
2513 iter1 = iter(self._r1)
2512 iter1 = iter(self._r1)
2514 iter2 = iter(self._r2)
2513 iter2 = iter(self._r2)
2515 gen = self._iterordered(self._ascending, iter1, iter2)
2514 gen = self._iterordered(self._ascending, iter1, iter2)
2516 self._iter = generatorset(gen)
2515 return gen
2517 return self._iter
2518
2516
2519 def __iter__(self):
2517 def __iter__(self):
2520 if self._genlist:
2518 if self._genlist:
General Comments 0
You need to be logged in to leave comments. Login now