Use next(iter) instead of iter.next()

diff --git a/dulwich/client.py b/dulwich/client.py
index 7b23e6763929e75f4dd5b319c7c4b8f557807901..40e68dfb5ea0d47d1f4cad69111d518c36367945 100644 (file)
--- a/dulwich/client.py
+++ b/dulwich/client.py
@@ -362,7 +362,7 @@ class GitClient(object):
         for want in wants[1:]:
             proto.write_pkt_line('want %s\n' % want)
         proto.write_pkt_line(None)
-        have = graph_walker.next()
+        have = next(graph_walker)
         while have:
             proto.write_pkt_line('have %s\n' % have)
             if can_read():
@@ -378,7 +378,7 @@ class GitClient(object):
                         raise AssertionError(
                             "%s not in ('continue', 'ready', 'common)" %
                             parts[2])
-            have = graph_walker.next()
+            have = next(graph_walker)
         proto.write_pkt_line('done\n')
 
     def _handle_upload_pack_tail(self, proto, capabilities, graph_walker,

diff --git a/dulwich/object_store.py b/dulwich/object_store.py
index b50fc7d36cb320c077c4cb45637da5686998a3b5..a6e15662a8a1478a622f8d4c7f9001ff19676678 100644 (file)
--- a/dulwich/object_store.py
+++ b/dulwich/object_store.py
@@ -185,12 +185,12 @@ class BaseObjectStore(object):
         :return: List of SHAs that are in common
         """
         haves = []
-        sha = graphwalker.next()
+        sha = next(graphwalker)
         while sha:
             if sha in self:
                 haves.append(sha)
                 graphwalker.ack(sha)
-            sha = graphwalker.next()
+            sha = next(graphwalker)
         return haves
 
     def generate_pack_contents(self, have, want, progress=None):

diff --git a/dulwich/refs.py b/dulwich/refs.py
index cb5079aca3d13a1c647b2a2c619fd6cb4eec0046..dc3c9e0efcbf3e06ca841a0b57cf9debc70cf8b5 100644 (file)
--- a/dulwich/refs.py
+++ b/dulwich/refs.py
@@ -447,7 +447,7 @@ class DiskRefsContainer(RefsContainer):
                     return {}
                 raise
             try:
-                first_line = iter(f).next().rstrip()
+                first_line = next(iter(f)).rstrip()
                 if (first_line.startswith("# pack-refs") and " peeled" in
                         first_line):
                     for sha, name, peeled in read_packed_refs_with_peeled(f):
@@ -498,7 +498,7 @@ class DiskRefsContainer(RefsContainer):
                 header = f.read(len(SYMREF))
                 if header == SYMREF:
                     # Read only the first line
-                    return header + iter(f).next().rstrip("\r\n")
+                    return header + next(iter(f)).rstrip("\r\n")
                 else:
                     # Read only the first 40 bytes
                     return header + f.read(40 - len(SYMREF))

diff --git a/dulwich/server.py b/dulwich/server.py
index 2e333da6c5f0aeb6d3c7727b79229a3635469717..7eba955a37dd5d042785ee81e3bd08abe089d85d 100644 (file)
--- a/dulwich/server.py
+++ b/dulwich/server.py
@@ -474,7 +474,7 @@ class ProtocolGraphWalker(object):
         if not self._cached:
             if not self._impl and self.http_req:
                 return None
-            return self._impl.next()
+            return next(self._impl)
         self._cache_index += 1
         if self._cache_index > len(self._cache):
             return None

diff --git a/dulwich/tests/test_object_store.py b/dulwich/tests/test_object_store.py
index 3455f1af9b65c69183bcf0f2731874a67becd3b4..3bb80649522e1edca3bc7e2022f70f073280def0 100644 (file)
--- a/dulwich/tests/test_object_store.py
+++ b/dulwich/tests/test_object_store.py
@@ -386,32 +386,32 @@ class ObjectStoreGraphWalkerTests(TestCase):
 
     def test_empty(self):
         gw = self.get_walker([], {})
-        self.assertIs(None, gw.next())
+        self.assertIs(None, next(gw))
         gw.ack("aa" * 20)
-        self.assertIs(None, gw.next())
+        self.assertIs(None, next(gw))
 
     def test_descends(self):
         gw = self.get_walker(["a"], {"a": ["b"], "b": []})
-        self.assertEqual("a", gw.next())
-        self.assertEqual("b", gw.next())
+        self.assertEqual("a", next(gw))
+        self.assertEqual("b", next(gw))
 
     def test_present(self):
         gw = self.get_walker(["a"], {"a": ["b"], "b": []})
         gw.ack("a")
-        self.assertIs(None, gw.next())
+        self.assertIs(None, next(gw))
 
     def test_parent_present(self):
         gw = self.get_walker(["a"], {"a": ["b"], "b": []})
-        self.assertEqual("a", gw.next())
+        self.assertEqual("a", next(gw))
         gw.ack("a")
-        self.assertIs(None, gw.next())
+        self.assertIs(None, next(gw))
 
     def test_child_ack_later(self):
         gw = self.get_walker(["a"], {"a": ["b"], "b": ["c"], "c": []})
-        self.assertEqual("a", gw.next())
-        self.assertEqual("b", gw.next())
+        self.assertEqual("a", next(gw))
+        self.assertEqual("b", next(gw))
         gw.ack("a")
-        self.assertIs(None, gw.next())
+        self.assertIs(None, next(gw))
 
     def test_only_once(self):
         # a  b
@@ -426,9 +426,9 @@ class ObjectStoreGraphWalkerTests(TestCase):
                 "d": ["e"],
                 "e": [],
                 })
-        self.assertEqual("a", gw.next())
-        self.assertEqual("c", gw.next())
+        self.assertEqual("a", next(gw))
+        self.assertEqual("c", next(gw))
         gw.ack("a")
-        self.assertEqual("b", gw.next())
-        self.assertEqual("d", gw.next())
-        self.assertIs(None, gw.next())
+        self.assertEqual("b", next(gw))
+        self.assertEqual("d", next(gw))
+        self.assertIs(None, next(gw))

diff --git a/dulwich/tests/test_refs.py b/dulwich/tests/test_refs.py
index 3b8559138795035e8ac1a07bc06be9e6f5c33de7..408d6c6c863cfdd852d863322c9744da4c6d8f36 100644 (file)
--- a/dulwich/tests/test_refs.py
+++ b/dulwich/tests/test_refs.py
@@ -299,7 +299,7 @@ class DiskRefsContainerTests(RefsContainerTests, TestCase):
 
         # ensure HEAD was not modified
         f = open(os.path.join(self._refs.path, 'HEAD'), 'rb')
-        self.assertEqual('ref: refs/heads/master', iter(f).next().rstrip('\n'))
+        self.assertEqual('ref: refs/heads/master', next(iter(f)).rstrip('\n'))
         f.close()
 
         # ensure the symbolic link was written through

diff --git a/dulwich/tests/test_server.py b/dulwich/tests/test_server.py
index 7274906ced4f4507ca2e5bd503086c1c7284f940..67eb63d9b3c277a378422e704256664cdc74de72 100644 (file)
--- a/dulwich/tests/test_server.py
+++ b/dulwich/tests/test_server.py
@@ -566,7 +566,7 @@ class AckGraphWalkerImplTestCase(TestCase):
         self.assertAck(None, 'nak')
 
     def assertNextEquals(self, sha):
-        self.assertEqual(sha, self._impl.next())
+        self.assertEqual(sha, next(self._impl))
 
 
 class SingleAckGraphWalkerImplTestCase(AckGraphWalkerImplTestCase):

diff --git a/dulwich/walk.py b/dulwich/walk.py
index 05514ff6588f56b3dbcb2053207bbf375a2b6c99..62f84c2e5232ab41493c27dcba61496dd740c375 100644 (file)
--- a/dulwich/walk.py
+++ b/dulwich/walk.py
@@ -303,7 +303,7 @@ class Walker(object):
     def _next(self):
         max_entries = self.max_entries
         while max_entries is None or self._num_entries < max_entries:
-            entry = self._queue.next()
+            entry = next(self._queue)
             if entry is not None:
                 self._out_queue.append(entry)
             if entry is None or len(self._out_queue) > _MAX_EXTRA_COMMITS:

diff --git a/examples/latest_change.py b/examples/latest_change.py
index 12b2084b8568f9cbfa62b50e9e0f572c2d12d034..04353f59890b0583ed67b4fb3be60a968492e325 100644 (file)
--- a/examples/latest_change.py
+++ b/examples/latest_change.py
@@ -13,7 +13,7 @@ r = Repo(".")
 
 w = r.get_walker(paths=[sys.argv[1]], max_entries=1)
 try:
-    c = iter(w).next().commit
+    c = next(iter(w)).commit
 except StopIteration:
     print("No file %s anywhere in history." % sys.argv[1])
 else: