[Checkins] SVN: BTrees/branches/py3k/ Use 'next()' builtin: iterators don't have a 'next' method.
Tres Seaver
cvs-admin at zope.org
Mon Dec 10 22:30:08 UTC 2012
Log message for revision 128568:
Use 'next()' builtin: iterators don't have a 'next' method.
Changed:
_U BTrees/branches/py3k/
U BTrees/branches/py3k/BTrees/_base.py
-=-
Modified: BTrees/branches/py3k/BTrees/_base.py
===================================================================
--- BTrees/branches/py3k/BTrees/_base.py 2012-12-10 22:30:07 UTC (rev 128567)
+++ BTrees/branches/py3k/BTrees/_base.py 2012-12-10 22:30:08 UTC (rev 128568)
@@ -159,7 +159,7 @@
__slots__ = ('to_iterate',
'useValues',
- '_next',
+ '_iter',
'active',
'position',
'key',
@@ -183,7 +183,7 @@
itmeth = to_iterate.__iter__
self.useValues = useValues
- self._next = itmeth().next
+ self._iter = itmeth()
self.active = True
self.position = 0
self.key = _marker
@@ -193,9 +193,9 @@
def advance(self):
try:
if self.useValues:
- self.key, self.value = self._next()
+ self.key, self.value = next(self._iter)
else:
- self.key = self._next()
+ self.key = next(self._iter)
self.position += 1
except StopIteration:
self.active = False
@@ -1161,7 +1161,6 @@
__slots__ = ()
- #_next = None
def add(self, key):
return self._set(self._to_key(key))[0]
More information about the checkins
mailing list