Commit c2ae37d5 authored by Tres Seaver's avatar Tres Seaver

Use 'next()' builtin: iterators don't have a 'next' method.

parent 70874539
...@@ -159,7 +159,7 @@ class _SetIteration(object): ...@@ -159,7 +159,7 @@ class _SetIteration(object):
__slots__ = ('to_iterate', __slots__ = ('to_iterate',
'useValues', 'useValues',
'_next', '_iter',
'active', 'active',
'position', 'position',
'key', 'key',
...@@ -183,7 +183,7 @@ class _SetIteration(object): ...@@ -183,7 +183,7 @@ class _SetIteration(object):
itmeth = to_iterate.__iter__ itmeth = to_iterate.__iter__
self.useValues = useValues self.useValues = useValues
self._next = itmeth().next self._iter = itmeth()
self.active = True self.active = True
self.position = 0 self.position = 0
self.key = _marker self.key = _marker
...@@ -193,9 +193,9 @@ class _SetIteration(object): ...@@ -193,9 +193,9 @@ class _SetIteration(object):
def advance(self): def advance(self):
try: try:
if self.useValues: if self.useValues:
self.key, self.value = self._next() self.key, self.value = next(self._iter)
else: else:
self.key = self._next() self.key = next(self._iter)
self.position += 1 self.position += 1
except StopIteration: except StopIteration:
self.active = False self.active = False
...@@ -1161,7 +1161,6 @@ class TreeSet(_Tree): ...@@ -1161,7 +1161,6 @@ class TreeSet(_Tree):
__slots__ = () __slots__ = ()
#_next = None
def add(self, key): def add(self, key):
return self._set(self._to_key(key))[0] return self._set(self._to_key(key))[0]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment