Merge branch 'main' into instruction-stream

Author: iritkatriel

Doc/library/itertools.rst

@@ -886,9 +886,12 @@ which incur interpreter overhead.
        except AttributeError:
            # Slow path for general iterables
            it = islice(iterable, start, None)
-           for i, element in enumerate(it, start):
-               if element is value or element == value:
-                   yield i
+           i = start - 1
+           try:
+               while True:
+                   yield (i := i + operator.indexOf(it, value) + 1)
+           except ValueError:
+               pass
        else:
            # Fast path for sequences
            i = start - 1

Lib/test/memory_watchdog.py

@@ -5,20 +5,13 @@
 # If the process crashes, reading from the /proc entry will fail with ESRCH.
 
 
-import os
 import sys
 import time
+from test.support import get_pagesize
 
 
-try:
-    page_size = os.sysconf('SC_PAGESIZE')
-except (ValueError, AttributeError):
-    try:
-        page_size = os.sysconf('SC_PAGE_SIZE')
-    except (ValueError, AttributeError):
-        page_size = 4096
-
 while True:
+    page_size = get_pagesize()
     sys.stdin.seek(0)
     statm = sys.stdin.read()
     data = int(statm.split()[5])

Lib/test/test_operator.py

@@ -208,6 +208,9 @@ def test_indexOf(self):
         nan = float("nan")
         self.assertEqual(operator.indexOf([nan, nan, 21], nan), 0)
         self.assertEqual(operator.indexOf([{}, 1, {}, 2], {}), 0)
+        it = iter('leave the iterator at exactly the position after the match')
+        self.assertEqual(operator.indexOf(it, 'a'), 2)
+        self.assertEqual(next(it), 'v')
 
     def test_invert(self):
         operator = self.module

Modules/_testcapi/code.c

@@ -92,7 +92,11 @@ test_code_extra(PyObject* self, PyObject *Py_UNUSED(callable))
         goto finally;
     }
     assert ((uintptr_t)extra == 77);
-
+    // Revert to initial code extra value.
+    res = PyUnstable_Code_SetExtra(test_func_code, code_extra_index, NULL);
+    if (res < 0) {
+        goto finally;
+    }
     result = Py_NewRef(Py_None);
 finally:
     Py_XDECREF(test_module);