wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Inherit 'required' correctly

Browse source
This commit is contained in:
Richard van der Hoff 2017-11-03 17:24:53 +00:00
parent e5e249dce1
commit fbd2b22c71
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templating/matrix_templates/units.py
View file

@ -143,10 +143,16 @@ def inherit_parents(obj):
# iterate through the parents first, and then overwrite with the settings
# from the child.
for p in map(inherit_parents, parents) + [obj]:
for key in ('type', 'title', 'required', 'description'):
# child blats out type, title and description
for key in ('type', 'title', 'description'):
if p.get(key):
result[key] = p[key]
# other fields get merged
for key in ('required', ):
if p.get(key):
result.setdefault(key, []).extend(p[key])
for key in ('properties', 'additionalProperties', 'patternProperties'):
if p.get(key):
result.setdefault(key, OrderedDict()).update(p[key])