bpo-33387: update documentation for exception handling opcode changes (GH-24334)

* bpo-33387: remove obsolete comment

* bpo-33387: update SETUP_WITH opcode documentation

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index c09d8338d2c3b3c51fe42c77c502fb56411d6a05..f3b25383c53d1ed84a044df84ab422ebbaebceb3 100644 (file)
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -742,7 +742,7 @@ iterations of the loop.
 
    This opcode performs several operations before a with block starts.  First,
    it loads :meth:`~object.__exit__` from the context manager and pushes it onto
-   the stack for later use by :opcode:`WITH_CLEANUP_START`.  Then,
+   the stack for later use by :opcode:`WITH_EXCEPT_START`.  Then,
    :meth:`~object.__enter__` is called, and a finally block pointing to *delta*
    is pushed.  Finally, the result of calling the ``__enter__()`` method is pushed onto
    the stack.  The next opcode will either ignore it (:opcode:`POP_TOP`), or

diff --git a/Python/compile.c b/Python/compile.c
index 6aa74cc2d67e42c32e4654ffd456e894a31fe353..223c63637ff411e6f2f4c6b00e6053452fe2b831 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -898,8 +898,6 @@ compiler_next_instr(basicblock *b)
    * 1 -- when jump
    * -1 -- maximal
  */
-/* XXX Make the stack effect of WITH_CLEANUP_START and
-   WITH_CLEANUP_FINISH deterministic. */
 static int
 stack_effect(int opcode, int oparg, int jump)
 {