Merge branch 'main' into inlinecomp2

* main: (60 commits) gh-102056: Fix a few bugs in error handling of exception printing code (#102078) gh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (#102012) gh-101566: Sync with zipp 3.14. (GH-102018) GH-99818: improve the documentation for zipfile.Path and Traversable (GH-101589) gh-88233: zipfile: handle extras after a zip64 extra (GH-96161) gh-101981: Apply HOMEBREW related environment variables (gh-102074) gh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (GH-101912) gh-101819: Adapt _io types to heap types, batch 1 (GH-101949) gh-101981: Build macOS as recommended by the devguide (GH-102070) gh-97786: Fix compiler warnings in pytime.c (#101826) gh-101578: Amend PyErr_{Set,Get}RaisedException docs (#101962) Misc improvements to the float tutorial (GH-102052) gh-85417: Clarify behaviour on branch cuts in cmath module (#102046) gh-100425: Update tutorial docs related to sum() accuracy (FH-101854) Add missing 'is' to `cmath.log()` docstring (#102049) gh-100210: Correct the comment link for unescaping HTML (#100212) gh-97930: Also include subdirectory in makefile. (#102030) gh-99735: Use required=True in argparse subparsers example (#100927) Fix incorrectly documented attribute in csv docs (#101250) GH-84783: Make the slice object hashable (GH-101264) ...
python · carljm · May 9, 2023 · Jan 30, 2023 · Jan 31, 2023 · Jan 31, 2023
commit 9f0fc5bf710b9054530cfc9bea62dbd87cd3f0ee
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
@@ -433,7 +433,8 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.12a5 3517 (Change YIELD_VALUE oparg to exception block depth)
 #     Python 3.12a5 3518 (Add RETURN_CONST instruction)
 #     Python 3.12a5 3519 (Modify SEND instruction)
-#     Python 3.12a5 3520 (Inline list/dict/set comprehensions)
+#     Python 3.12a5 3520 (Remove PREP_RERAISE_STAR, add CALL_INTRINSIC_2)
+#     Python 3.12a5 3521 (Inline list/dict/set comprehensions)
 
 #     Python 3.13 will start with 3550
 
@@ -446,7 +447,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3520).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3521).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 

diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h