I suggest to apply right now those changes which are compatible with current behavior and don't make code more cumbersome. E.g.

-        while True:
-            yield next(line_pair_iterator)
+        yield from line_pair_iterator

and

-        raise StopIteration
+        return

To me these changes make code even better and are worth to be applied even if PEP 479 will be rejected.