From ce34ba6e3c5f44d40d723933cd9c03af70a50410 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 9 May 2013 14:22:05 +0300
Subject: Issue #16601: Restarting iteration over tarfile no more continues
 from where it left off.  Patch by Michael Birtwell.

---
 Lib/tarfile.py           | 12 +++++++-----
 Lib/test/test_tarfile.py |  8 ++++++++
 Misc/ACKS                |  1 +
 Misc/NEWS                |  3 +++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 89d8cc3..16a6e86 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -2462,16 +2462,18 @@ class TarIter:
         # Fix for SF #1100429: Under rare circumstances it can
         # happen that getmembers() is called during iteration,
         # which will cause TarIter to stop prematurely.
-        if not self.tarfile._loaded:
+
+        if self.index == 0 and self.tarfile.firstmember is not None:
+            tarinfo = self.tarfile.next()
+        elif self.index < len(self.tarfile.members):
+            tarinfo = self.tarfile.members[self.index]
+        elif not self.tarfile._loaded:
             tarinfo = self.tarfile.next()
             if not tarinfo:
                 self.tarfile._loaded = True
                 raise StopIteration
         else:
-            try:
-                tarinfo = self.tarfile.members[self.index]
-            except IndexError:
-                raise StopIteration
+            raise StopIteration
         self.index += 1
         return tarinfo
 
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index af59e27..69d342a 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -345,6 +345,14 @@ class MiscReadTest(CommonReadTest):
         finally:
             os.remove(empty)
 
+    def test_parallel_iteration(self):
+        # Issue #16601: Restarting iteration over tarfile continued
+        # from where it left off.
+        with tarfile.open(self.tarname) as tar:
+            for m1, m2 in zip(tar, tar):
+                self.assertEqual(m1.offset, m2.offset)
+                self.assertEqual(m1.name, m2.name)
+
 
 class StreamReadTest(CommonReadTest):
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 9e09abd..7f78dbd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -96,6 +96,7 @@ Natalia B. Bidart
 David Binger
 Dominic Binks
 Philippe Biondi
+Michael Birtwell
 Stuart Bishop
 Roy Bixler
 Jonathan Black
diff --git a/Misc/NEWS b/Misc/NEWS
index 6eea7de..2c09420 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #16601: Restarting iteration over tarfile no more continues from where
+  it left off.  Patch by Michael Birtwell.
+
 - Issue 16584: in filecomp._cmp, catch IOError as well as os.error.
   Patch by Till Maas.
 
-- 
cgit v0.12