Skip to content

Commit

Permalink
gh-123363: Show string value of CONTAINS_OP oparg in dis (#123387)
Browse files Browse the repository at this point in the history
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
  • Loading branch information
Alexandr153 and blurb-it[bot] authored Aug 28, 2024
1 parent 2231286 commit 6a7765b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Lib/dis.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
STORE_FAST_LOAD_FAST = opmap['STORE_FAST_LOAD_FAST']
STORE_FAST_STORE_FAST = opmap['STORE_FAST_STORE_FAST']
IS_OP = opmap['IS_OP']
CONTAINS_OP = opmap['CONTAINS_OP']

CACHE = opmap["CACHE"]

Expand Down Expand Up @@ -632,6 +633,8 @@ def get_argval_argrepr(self, op, arg, offset):
argrepr = _special_method_names[arg]
elif deop == IS_OP:
argrepr = 'is not' if argval else 'is'
elif deop == CONTAINS_OP:
argrepr = 'not in' if argval else 'in'
return argval, argrepr

def get_instructions(x, *, first_line=None, show_caches=None, adaptive=False):
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_dis.py
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,15 @@ def test_is_op_format(self):
dis.dis("a is not b", file=output, show_caches=True)
self.assertIn("IS_OP 1 (is not)", output.getvalue())

def test_contains_op_format(self):
output = io.StringIO()
dis.dis("a in b", file=output, show_caches=True)
self.assertIn("CONTAINS_OP 0 (in)", output.getvalue())

output = io.StringIO()
dis.dis("a not in b", file=output, show_caches=True)
self.assertIn("CONTAINS_OP 1 (not in)", output.getvalue())

def test_baseopname_and_baseopcode(self):
# Standard instructions
for name, code in dis.opmap.items():
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Show string value of :opcode:`CONTAINS_OP` oparg in :mod:`dis` output.
Patch by Alexandr153.

0 comments on commit 6a7765b

Please sign in to comment.