Skip to content

gh-135700: Fix instructions in __annotate__ have incorrect code positions #136543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

gh-135700: Fix instructions in __annotate__ have incorrect code positions #136543

wants to merge 5 commits into from
+34 −7

Conversation

AndPuQing
Copy link
Contributor

@AndPuQing AndPuQing commented Jul 11, 2025 •
edited
Loading

AndPuQing and others added 4 commits July 11, 2025 20:52
@AndPuQing
fix instructions in __annotate__ have incorrect code positions
4b2ec1e
@blurb-it @AndPuQing
📜🤖 Added by blurb_it.
35246e7
@AndPuQing @sobolevn
Update Misc/NEWS.d/next/Core_and_Builtins/2025-06-22-10-47-27.gh-issu…
97bddb8 
…e-135700.0qdtCl.rst

Co-authored-by: sobolevn <mail@sobolevn.me>
@AndPuQing @iritkatriel @15r10nk
add unit tests
4de616a 
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Co-authored-by: Frank Hoffmann <15r10nk@users.noreply.github.com>
@bedevere-app bedevere-app bot mentioned this pull request Jul 11, 2025
Open
iritkatriel
iritkatriel reviewed Jul 12, 2025
View reviewed changes
Lib/test/test_pdb.py
c
"""
result = self.run_pdb_script(script, commands)
self.assertNotIn("(1)__annotate__()", result[0])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test passes for me on main (without this PR).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is the indentation. @AndPuQing indented my code in the strings which (for some unknown reason for me) caused the test to pass. a textwrap.dedent should help.

Copy link
Contributor Author

@AndPuQing AndPuQing Jul 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I fixed the indent problem, but it seems that the current fix also cannot pass the test.

======================================================================
FAIL: test_issue135700 (test.test_pdb.PdbTestCase.test_issue135700)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/mnt/data/xxx/dev/cpython/Lib/test/test_pdb.py", line 3842, in test_issue135700
    self.assertNotIn("(1)__annotate__()", result[0])
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: '(1)__annotate__()' unexpectedly found in '> ...
../cpython/python -m dis testmod.py                                                                            (base) 
  --           MAKE_CELL                0 (__conditional_annotations__)

   0           RESUME                   0

   1           LOAD_CONST               2 (<code object __annotate__ at 0x798bd679cd50, file "testmod.py", line 1>)
               MAKE_FUNCTION
               STORE_NAME               2 (__annotate__)
               BUILD_SET                0
               STORE_NAME               0 (__conditional_annotations__)

   3           LOAD_BUILD_CLASS
               PUSH_NULL
               LOAD_CONST               0 (<code object ClassVar at 0x798bd6bb1940, file "testmod.py", line 3>)
               MAKE_FUNCTION
               LOAD_CONST               1 ('ClassVar')
               CALL                     2
               STORE_NAME               1 (ClassVar)

   5           LOAD_NAME                0 (__conditional_annotations__)
               LOAD_SMALL_INT           0
               SET_ADD                  1
               POP_TOP
               LOAD_CONST               3 (None)
               RETURN_VALUE

Disassembly of <code object ClassVar at 0x798bd6bb1940, file "testmod.py", line 3>:
  3           RESUME                   0
              LOAD_NAME                0 (__name__)
              STORE_NAME               1 (__module__)
              LOAD_CONST               0 ('ClassVar')
              STORE_NAME               2 (__qualname__)
              LOAD_SMALL_INT           3
              STORE_NAME               3 (__firstlineno__)

  4           LOAD_CONST               1 (())
              STORE_NAME               4 (__static_attributes__)
              LOAD_CONST               2 (None)
              RETURN_VALUE

Disassembly of <code object __annotate__ at 0x798bd679cd50, file "testmod.py", line 1>:
  1           RESUME                   0
              LOAD_FAST_BORROW         0 (format)
              LOAD_SMALL_INT           2
              COMPARE_OP             132 (>)
              POP_JUMP_IF_FALSE        3 (to L1)
              NOT_TAKEN
              LOAD_COMMON_CONSTANT     1 (NotImplementedError)
              RAISE_VARARGS            1
      L1:     BUILD_MAP                0

  5           LOAD_SMALL_INT           0
              LOAD_GLOBAL              0 (__conditional_annotations__)
              CONTAINS_OP              0 (in)
              POP_JUMP_IF_FALSE       10 (to L2)
              NOT_TAKEN
              LOAD_GLOBAL              2 (ClassVar)
              COPY                     2
              LOAD_CONST               1 ('__dataclass_fields__')

  1           STORE_SUBSCR
      L2:     RETURN_VALUE

@AndPuQing @iritkatriel
Update Lib/test/test_pdb.py
a297926 
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iritkatriel iritkatriel iritkatriel left review comments

@15r10nk 15r10nk 15r10nk left review comments

@blockchainGuru1018 blockchainGuru1018 blockchainGuru1018 approved these changes

@gaogaotiantian gaogaotiantian Awaiting requested review from gaogaotiantian gaogaotiantian is a code owner

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees
No one assigned
Labels
awaiting core review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AndPuQing @iritkatriel @15r10nk @blockchainGuru1018
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy