800: Allow declaring that multiple Entities should be created/updated

pyxform/aliases.py

@@ -90,7 +90,7 @@
     "requiredmsg": ("bind", "jr:requiredMsg"),
     "required_message": ("bind", "jr:requiredMsg"),
     "body": "control",
-    constants.ENTITIES_SAVETO: ("bind", "entities:saveto"),
+    constants.ENTITIES_SAVETO: ("bind", constants.ENTITIES_SAVETO_NS),
 }
 
 entities_header = {constants.LIST_NAME_U: "dataset"}

pyxform/builder.py

@@ -4,6 +4,7 @@
 
 import os
 from collections import defaultdict
+from collections.abc import Mapping
 from typing import Any
 
 from pyxform import constants as const
@@ -65,7 +66,7 @@ def set_sections(self, sections):
         the name of the section and the value is a dict that can be
         used to create a whole survey.
         """
-        if not isinstance(sections, dict):
+        if not isinstance(sections, Mapping):
             raise PyXFormError("""Invalid value for `sections`.""")
         self._sections = sections
 
@@ -79,7 +80,7 @@ def create_survey_element_from_dict(
 
         :param d: data to use for constructing SurveyElements.
         """
-        if "add_none_option" in d:
+        if d.get("add_none_option", None) is not None:
             self._add_none_option = d["add_none_option"]
 
         if d[const.TYPE] in SECTION_CLASSES:
@@ -266,7 +267,7 @@ def _name_and_label_substitutions(question_template, column_headers):
         # if the label in column_headers has multiple languages setup a
         # dictionary by language to do substitutions.
         info_by_lang = None
-        if isinstance(column_headers[const.LABEL], dict):
+        if isinstance(column_headers[const.LABEL], Mapping):
             info_by_lang = {
                 lang: {
                     const.NAME: column_headers[const.NAME],
@@ -279,10 +280,10 @@ def _name_and_label_substitutions(question_template, column_headers):
         for key in result:
             if isinstance(result[key], str):
                 result[key] %= column_headers
-            elif isinstance(result[key], dict):
+            elif isinstance(result[key], Mapping):
                 result[key] = result[key].copy()
                 for key2 in result[key]:
-                    if info_by_lang and isinstance(column_headers[const.LABEL], dict):
+                    if info_by_lang and isinstance(column_headers[const.LABEL], Mapping):
                         result[key][key2] %= info_by_lang.get(key2, column_headers)
                     else:
                         result[key][key2] %= column_headers

pyxform/constants.py

@@ -14,6 +14,7 @@
 TITLE = "title"
 NAME = "name"
 ENTITIES_SAVETO = "save_to"
+ENTITIES_SAVETO_NS = "entities:saveto"
 ID_STRING = "id_string"
 SMS_KEYWORD = "sms_keyword"
 SMS_FIELD = "sms_field"