File tree 1 file changed +12
-4
lines changed
1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -54,11 +54,18 @@ def __init_subclass__(cls, **kwargs):
54
54
)
55
55
if base_class_fields or this_class_fields :
56
56
enabled = {** base_class_fields ["enabled" ], ** this_class_fields ["enabled" ]}
57
- disabled = {** this_class_fields ["disabled" ]}
58
- for name , info in this_class_fields ["disabled" ].items ():
57
+ for name in this_class_fields ["disabled" ]:
59
58
if name in enabled :
60
59
del enabled [name ]
61
- disabled [name ] = info
60
+
61
+ disabled = {
62
+ ** base_class_fields ["disabled" ],
63
+ ** this_class_fields ["disabled" ],
64
+ }
65
+ for name in base_class_fields ["disabled" ]:
66
+ if name in enabled :
67
+ del disabled [name ]
68
+
62
69
setattr (
63
70
cls ,
64
71
_FIELDS_INFO_ATTRIBUTE_READ ,
@@ -157,7 +164,8 @@ def get_fields_dict(
157
164
fields_info = getattr (
158
165
cls_or_instance , _FIELDS_INFO_ATTRIBUTE_READ , _fields_template ()
159
166
)
160
- fields_dict = fields_info ["enabled" ]
167
+ fields_dict = {}
168
+ fields_dict .update (fields_info ["enabled" ])
161
169
if include_disabled :
162
170
fields_dict .update (fields_info ["disabled" ])
163
171
return fields_dict
You can’t perform that action at this time.
0 commit comments