Properly load SecondaryFiles DSL

mr-c · mr-c · commit 4f7023a177e0 · 2021-10-20T13:44:35.000+02:00
diff --git a/schema_salad/metaschema.py b/schema_salad/metaschema.py
@@ -337,6 +337,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                                 d
                             )
                         )
+                    r.append(new_dict)
 
                 else:
                     raise ValidationException(
@@ -360,6 +361,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                         doc
                     )
                 )
+            r.append(new_dict)
 
         elif isinstance(doc, str):
             if doc.endswith("?"):
diff --git a/schema_salad/python_codegen_support.py b/schema_salad/python_codegen_support.py
@@ -334,6 +334,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                                 d
                             )
                         )
+                    r.append(new_dict)
 
                 else:
                     raise ValidationException(
@@ -357,6 +358,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                         doc
                     )
                 )
+            r.append(new_dict)
 
         elif isinstance(doc, str):
             if doc.endswith("?"):

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):`
`337`	`337`	`d`
`338`	`338`	`)`
`339`	`339`	`)`
	`340`	`+ r.append(new_dict)`
`340`	`341`
`341`	`342`	`else:`
`342`	`343`	`raise ValidationException(`
`@@ -360,6 +361,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):`
`360`	`361`	`doc`
`361`	`362`	`)`
`362`	`363`	`)`
	`364`	`+ r.append(new_dict)`
`363`	`365`
`364`	`366`	`elif isinstance(doc, str):`
`365`	`367`	`if doc.endswith("?"):`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):`
`334`	`334`	`d`
`335`	`335`	`)`
`336`	`336`	`)`
	`337`	`+ r.append(new_dict)`
`337`	`338`
`338`	`339`	`else:`
`339`	`340`	`raise ValidationException(`
`@@ -357,6 +358,7 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):`
`357`	`358`	`doc`
`358`	`359`	`)`
`359`	`360`	`)`
	`361`	`+ r.append(new_dict)`
`360`	`362`
`361`	`363`	`elif isinstance(doc, str):`
`362`	`364`	`if doc.endswith("?"):`