File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5908,7 +5908,12 @@ structmeta_process_rename(
59085908 ((Field *)default_value)->name != NULL
59095909 ) {
59105910 Field *field = (Field *)default_value;
5911- if (PyUnicode_Compare(name, field->name) == 0) return 0;
5911+ if (PyUnicode_Compare(name, field->name) == 0) {
5912+ if (PyDict_GetItem(info->renamed_fields, name) != NULL) {
5913+ return PyDict_DelItem(info->renamed_fields, name);
5914+ }
5915+ return 0;
5916+ }
59125917 return PyDict_SetItem(info->renamed_fields, name, field->name);
59135918 }
59145919
@@ -5953,6 +5958,9 @@ structmeta_process_rename(
59535958 if (PyUnicode_Compare(name, temp) != 0) {
59545959 out = PyDict_SetItem(info->renamed_fields, name, temp);
59555960 }
5961+ else if (PyDict_GetItem(info->renamed_fields, name) != NULL) {
5962+ out = PyDict_DelItem(info->renamed_fields, name);
5963+ }
59565964 Py_DECREF(temp);
59575965 return out;
59585966}
Original file line number Diff line number Diff line change @@ -2102,6 +2102,29 @@ class Test4(Base, rename=None):
21022102
21032103 assert Test4 .__struct_encode_fields__ == ("my_field" ,)
21042104
2105+ def test_field_name_override_inherited (self ):
2106+ class Base (Struct ):
2107+ x : int = field (name = "_x" )
2108+
2109+ class Test1 (Base ):
2110+ x : int = field (name = "x" )
2111+
2112+ assert Test1 .__struct_encode_fields__ == ("x" ,)
2113+
2114+ class Test2 (Base ):
2115+ x : int = 1
2116+
2117+ assert Test2 .__struct_encode_fields__ == ("_x" ,)
2118+
2119+ def test_rename_override_inherited (self ):
2120+ class Base (Struct , rename = "upper" ):
2121+ x : int
2122+
2123+ class Test (Base , rename = "lower" ):
2124+ x : int
2125+
2126+ assert Test .__struct_encode_fields__ == ("x" ,)
2127+
21052128 def test_rename_fields_only_used_for_encode_and_decode (self ):
21062129 """Check that the renamed fields don't show up elsewhere"""
21072130
You can’t perform that action at this time.
0 commit comments