Use next instead of six.next

zopefoundation · Apr 3, 2018 · cb7f040 · cb7f040
1 parent 4371bbf
commit cb7f040
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/zc/relation/catalog.py b/src/zc/relation/catalog.py
@@ -903,7 +903,7 @@ def yieldRelationTokenChains(self, query, relData, maxDepth, checkFilter,
         while stack:
             tokenChain, relDataIter = stack[0]
             try:
-                relToken = six.next(relDataIter)
+                relToken = next(relDataIter)
             except StopIteration:
                 stack.pop(0)
             else:
@@ -1159,7 +1159,7 @@ def canFind(self, query, maxDepth=None, filter=None,
             queryFactory, getQueries = self._getQueryFactory(
                 query, queryFactory)
         try:
-            six.next(self.yieldRelationTokenChains(
+            next(self.yieldRelationTokenChains(
                 *self._parse(
                     query, maxDepth, filter, targetQuery,
                     targetFilter, getQueries) +

diff --git a/src/zc/relation/searchindex.py b/src/zc/relation/searchindex.py
@@ -17,7 +17,6 @@
 
 import BTrees
 import persistent
-import six
 import zc.relation.catalog
 import zc.relation.interfaces
 import zc.relation.queryfactory
@@ -173,7 +172,7 @@ def _index(self, token, removals=None, remove=False):
                         indexed = self.index.get(rel)
                         if indexed is None:
                             iterator = reversed(stack)
-                            traversed = [six.next(iterator)]
+                            traversed = [next(iterator)]
                             for info in iterator:
                                 if rel == info[0]:
                                     sets = info[2]
@@ -438,18 +437,18 @@ def getQueries(self, token, catalog, additions, removals, removed):
         for name in self.names:
             src = source[name]
             iterator = iter(src)
-            value = six.next(iterator)  # should always have at least one
+            value = next(iterator)  # should always have at least one
             vals.append([name, value, iterator, src])
         while 1:
             yield BTrees.family32.OO.Bucket(
                 [(name, value) for name, value, iterator, src in vals])
             for s in vals:
                 name, value, iterator, src = s
                 try:
-                    s[1] = six.next(iterator)
+                    s[1] = next(iterator)
                 except StopIteration:
                     iterator = s[2] = iter(src)
-                    s[1] = six.next(iterator)
+                    s[1] = next(iterator)
                 else:
                     break
             else: