Merge pull request hed-standard#743 from IanCa/develop

Allow dict as a parameter to DefinitionDict

Author: VisLab

hed/models/definition_dict.py

@@ -33,7 +33,9 @@ def add_definitions(self, def_dicts, hed_schema=None):
         """ Add definitions from dict(s) to this dict.
 
         Parameters:
-            def_dicts (list or DefinitionDict): DefDict or list of DefDicts/strings whose definitions should be added.
+            def_dicts (list or DefinitionDict or dict): DefinitionDict or list of DefinitionDicts/strings/dicts whose
+                                                definitions should be added.
+                                        Note dict form expects DefinitionEntries in the same form as a DefinitionDict
             hed_schema(HedSchema or None): Required if passing strings or lists of strings, unused otherwise.
             
         :raises TypeError:
@@ -42,7 +44,7 @@ def add_definitions(self, def_dicts, hed_schema=None):
         if not isinstance(def_dicts, list):
             def_dicts = [def_dicts]
         for def_dict in def_dicts:
-            if isinstance(def_dict, DefinitionDict):
+            if isinstance(def_dict, (DefinitionDict, dict)):
                 self._add_definitions_from_dict(def_dict)
             elif isinstance(def_dict, str) and hed_schema:
                 self.check_for_definitions(HedString(def_dict, hed_schema))
@@ -64,7 +66,7 @@ def _add_definitions_from_dict(self, def_dict):
         """ Add the definitions found in the given definition dictionary to this mapper.
 
          Parameters:
-             def_dict (DefinitionDict): DefDict whose definitions should be added.
+             def_dict (DefinitionDict or dict): DefDict whose definitions should be added.
 
         """
         for def_tag, def_value in def_dict.items():