mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-121210: handle nodes with missing attributes/fields in ast.compare (#121211)

Browse source
This commit is contained in:
Bénédikt Tran 2024-07-02 12:53:17 +02:00 • committed by GitHub
parent 7a807c3efa
commit 15232a0819
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/ast.py
View file

@ -422,6 +422,8 @@ def compare(
might differ in whitespace or similar details.
"""
sentinel = object() # handle the possibility of a missing attribute/field
def _compare(a, b):
# Compare two fields on an AST object, which may themselves be
# AST objects, lists of AST objects, or primitive ASDL types
@ -449,8 +451,14 @@ def compare(
if a._fields != b._fields:
return False
for field in a._fields:
a_field = getattr(a, field)
b_field = getattr(b, field)
a_field = getattr(a, field, sentinel)
b_field = getattr(b, field, sentinel)
if a_field is sentinel and b_field is sentinel:
# both nodes are missing a field at runtime
continue
if a_field is sentinel or b_field is sentinel:
# one of the node is missing a field
return False
if not _compare(a_field, b_field):
return False
else:
@ -461,8 +469,11 @@ def compare(
return False
# Attributes are always ints.
for attr in a._attributes:
a_attr = getattr(a, attr)
b_attr = getattr(b, attr)
a_attr = getattr(a, attr, sentinel)
b_attr = getattr(b, attr, sentinel)
if a_attr is sentinel and b_attr is sentinel:
# both nodes are missing an attribute at runtime
continue
if a_attr != b_attr:
return False
else: