fix: SentinelNodeFinder uses now mangled_name by 15r10nk · Pull Request #95 · alexmojaki/executing

15r10nk · 2025-01-14T06:15:06Z

closes #99

alexmojaki

thanks so much

alexmojaki · 2025-08-17T19:32:02Z

executing/_types.py

alexmojaki · 2025-08-17T19:35:27Z

executing/executing.py

+            if sys.version_info[0] == 3 or instruction.argval:
+                extra_filter =lambda e:mangled_name(e) == instruction.argval 


Suggested change

if sys.version_info[0] == 3 or instruction.argval:

extra_filter =lambda e:mangled_name(e) == instruction.argval

extra_filter =lambda e:mangled_name(e) == instruction.argval

python 3 only now

alexmojaki · 2025-08-17T19:35:35Z

executing/executing.py

+            print(instruction)
+
+            print(exprs)
+


Suggested change

print(instruction)

print(exprs)

alexmojaki · 2025-08-17T19:36:35Z

tests/test_pytest.py

-    import dis

-    def test_mangled_name():
+@pytest.mark.skipif(sys.version_info < (3,), reason="argval of some Instructions is None")


Suggested change

@pytest.mark.skipif(sys.version_info < (3,), reason="argval of some Instructions is None")

alexmojaki · 2025-08-17T19:37:13Z

tests/test_pytest.py

+if sys.version_info < (3,):
+    def indent(s,prefix):
+        return prefix + s.replace("\n","\n"+prefix)
+else:
    from textwrap import indent


Suggested change

if sys.version_info < (3,):

def indent(s,prefix):

return prefix + s.replace("\n","\n"+prefix)

else:

from textwrap import indent

from textwrap import indent

alexmojaki · 2025-08-17T19:37:27Z

tests/test_pytest.py

+from executing._utils import mangled_name
+import dis


pls move to top

alexmojaki · 2025-08-17T19:37:50Z

tests/test_pytest.py

                        ast.ExceptHandler,
-                    ),
+                    )
+            if sys.version_info>=(3,):


no need to check any more

alexmojaki · 2025-08-17T19:39:03Z

tests/test_pytest.py

                        # IMPORT_FROM(_Test__submodule11c)
                        # STORE_NAME(_Test__subc11)

+                        if instruction.opname=="LOAD_ATTR" and before is not None  and before.opname == "IMPORT_NAME":


Suggested change

if instruction.opname=="LOAD_ATTR" and before is not None and before.opname == "IMPORT_NAME":

if instruction.opname == "LOAD_ATTR" and before is not None and before.opname == "IMPORT_NAME":

we really need proper tooling in this repo like ruff

yes, I was thinking the same already last year. I will create an issue with some step by step plan.

15r10nk · 2025-08-17T20:06:50Z

Thank you for taking the time to review this, and please excuse the silly mistakes.

alexmojaki · 2025-08-17T20:06:35Z

executing/executing.py

            typ = ast.Name
            ctx = ast.Load
-            extra_filter = lambda e: e.id == instruction.argval
+            if instruction.argval:


The original was if sys.version_info[0] == 3 or instruction.argval:, with an or, so is this check needed?

it is not needed 4 lines above and it is most likely not needed here.

alexmojaki · 2025-08-17T20:32:10Z

any idea what's going on with github?

15r10nk · 2025-08-18T06:07:09Z

Microsoft has taken over ... I have no idea.

15r10nk · 2025-08-18T06:38:51Z

I have restarted them with debug output but they are just waiting ...

15r10nk · 2025-08-19T07:03:14Z

github could not schedule the jobs because ubuntu 20.04 was not available any more.

alexmojaki · 2025-08-19T20:58:04Z

tests/test_pytest.py

                        # STORE_NAME(_Test__subc11)

+                        if instruction.opname == "LOAD_ATTR" and before is not None and before.opname == "IMPORT_NAME":
+                            continue


needs a comment to explain

alexmojaki · 2025-08-19T20:58:49Z

tests/test_main.py

-            # covered by the verifier and much more complex in python 3.11 
-            if isinstance(node, ast.Name) and not py11:
-                assert inst.argval == node.id, (inst, ast.dump(node))
+            if isinstance(node, ast.Name) and inst.opname != "CALL_INTRINSIC_1" and inst.argval not in ("__classdict__","__classdictcell__","__static_attributes__"):


is this worth explaining?

Deleting it caused no problem and I can't remember why this was needed. Maybe it is just not needed any more.

looks like this reply was meant to be on the other comment?

Yes, sorry. I wrote it on my phone.

alexmojaki · 2025-08-20T21:13:18Z

Thanks!

fix: use mangled_name in sentinel node finder to fix some issues

116f70e

najmijeffreyyyyyyy approved these changes Apr 25, 2025

View reviewed changes

fix: prevent pytest from thinking that Tester() could be a test function

6c3459c

15r10nk force-pushed the fix_mangled_name branch from e7fbef0 to 6c3459c Compare August 17, 2025 15:07

15r10nk mentioned this pull request Aug 17, 2025

3.14 support #97

Merged

15r10nk marked this pull request as ready for review August 17, 2025 15:11

alexmojaki reviewed Aug 17, 2025

View reviewed changes

15r10nk force-pushed the fix_mangled_name branch from 9690215 to 65b15b0 Compare August 19, 2025 05:34

refactor: review changes

b44d92d

15r10nk force-pushed the fix_mangled_name branch from 65b15b0 to b44d92d Compare August 19, 2025 07:00

alexmojaki reviewed Aug 19, 2025

View reviewed changes

refactor: review changes

155c7c1

alexmojaki merged commit f64f00d into master Aug 20, 2025
7 checks passed

		if sys.version_info[0] == 3 or instruction.argval:
		extra_filter =lambda e:mangled_name(e) == instruction.argval

	if instruction.opname=="LOAD_ATTR" and before is not None and before.opname == "IMPORT_NAME":
	if instruction.opname == "LOAD_ATTR" and before is not None and before.opname == "IMPORT_NAME":

Conversation

15r10nk commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexmojaki left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

15r10nk commented Aug 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexmojaki commented Aug 17, 2025

Uh oh!

15r10nk commented Aug 18, 2025

Uh oh!

15r10nk commented Aug 18, 2025

Uh oh!

15r10nk commented Aug 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alexmojaki commented Aug 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

15r10nk commented Jan 14, 2025 •

edited

Loading