]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-118476: Fix corner cases in islice() rough equivalent. (Gh-118559)
authorRaymond Hettinger <rhettinger@users.noreply.github.com>
Sun, 5 May 2024 06:42:30 +0000 (01:42 -0500)
committerGitHub <noreply@github.com>
Sun, 5 May 2024 06:42:30 +0000 (01:42 -0500)
Doc/library/itertools.rst

index 820906085151a323ec61ce253a38d6652147b4fb..fb3f33370e3faa2a2e2bce675d307fbda7e67344 100644 (file)
@@ -504,24 +504,17 @@ loops that truncate the stream.
           # islice('ABCDEFG', 2, None) → C D E F G
           # islice('ABCDEFG', 0, None, 2) → A C E G
           s = slice(*args)
-          start, stop, step = s.start or 0, s.stop or sys.maxsize, s.step or 1
-          it = iter(range(start, stop, step))
-          try:
-              nexti = next(it)
-          except StopIteration:
-              # Consume *iterable* up to the *start* position.
-              for i, element in zip(range(start), iterable):
-                  pass
-              return
-          try:
-              for i, element in enumerate(iterable):
-                  if i == nexti:
-                      yield element
-                      nexti = next(it)
-          except StopIteration:
-              # Consume to *stop*.
-              for i, element in zip(range(i + 1, stop), iterable):
-                  pass
+          start = 0 if s.start is None else s.start
+          stop = s.stop
+          step = 1 if s.step is None else s.step
+          if start < 0 or (stop is not None and stop < 0) or step <= 0:
+              raise ValueError
+          indices = count() if stop is None else range(max(stop, start))
+          next_i = start
+          for i, element in zip(indices, iterable):
+              if i == next_i:
+                  yield element
+                  next_i += step
 
 
 .. function:: pairwise(iterable)