access-config-utils 0.2__tar.gz → 0.4__tar.gz

{access_config_utils-0.2 → access_config_utils-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: access-config-utils
-Version: 0.2
+Version: 0.4
 Summary: Utilities to work with configurations for the ACCESS climate models.
 Author-email: Micael Oliveira <micael.oliveira@anu.edu.au>
 Keywords: configurations,parser,access

{access_config_utils-0.2 → access_config_utils-0.4}/src/access/config/config_dict.py

@@ -57,16 +57,17 @@ class ConfigList(list):
 
     Args:
         data (list[Any]): The list data.
-        nodes (Sequence[Tree]): The node backing each element. A repeat node appears once
+        nodes (Sequence[Tree | None]): The node backing each element, or ``None`` where an
+            array position no entry wrote has none. A repeat node appears once
             per element it covers, so this is one entry per element, not per node.
         ctx (ParseContext): The compiled grammar, needed to parse the replacement for a
             repeat run that an assignment has split.
     """
 
-    _nodes: list[Tree]  # The parse tree node backing each list element.
+    _nodes: list[Tree | None]  # The node backing each element, None where the file wrote nothing.
     _ctx: ParseContext  # Compiled grammar and per-parser settings.
 
-    def __init__(self, data: list[Any], nodes: Sequence[Tree], ctx: ParseContext) -> None:
+    def __init__(self, data: list[Any], nodes: Sequence[Tree | None], ctx: ParseContext) -> None:
         super().__init__(data)
         self._nodes = list(nodes)
         self._ctx = ctx
@@ -89,13 +90,17 @@ class ConfigList(list):
             ValueError: If a slice assignment would change the list length.
         """
         updated = list(self)
+        # Held for the super() call below rather than reusing *value*: for a slice that may
+        # have been a one-shot iterable, already drained here, and taking it a second time
+        # would leave the list short.
+        assigned: Any = value
         if isinstance(index, slice):
-            values = list(value)
-            if len(values) != len(self._nodes[index]):
+            assigned = list(value)
+            if len(assigned) != len(self._nodes[index]):
                 raise ValueError(
-                    f"Slice assignment would change list length from {len(self._nodes[index])} to {len(values)}"
+                    f"Slice assignment would change list length from {len(self._nodes[index])} to {len(assigned)}"
                 )
-            updated[index] = values
+            updated[index] = assigned
         else:
             updated[index] = value
 
@@ -103,9 +108,7 @@ class ConfigList(list):
         # several of them at once, so the run it covers is rewritten as a unit. Writing a
         # value back over itself reproduces its own token, so untouched ones do not move.
         self._nodes[:] = write_values(self._nodes, updated, self._ctx.lark)
-        # Not *value*: for a slice it may have been a one-shot iterable, already drained
-        # above, and taking it a second time would leave the list short.
-        super().__setitem__(index, values if isinstance(index, slice) else value)
+        super().__setitem__(index, assigned)
 
     def _unsupported(self, *args: Any, **kwargs: Any) -> NoReturn:
         """Reject a list operation the parse tree cannot follow.

{access_config_utils-0.2 → access_config_utils-0.4}/src/access/config/config_store.py

@@ -76,7 +76,7 @@ class ConfigStore:
         """
         return ConfigStore(ref.block_nodes[index], self.ctx, addable=ref.addable)
 
-    def replace(self, key: str, value: Any) -> tuple[Tree, ...]:
+    def replace(self, key: str, value: Any) -> tuple[Tree | None, ...]:
         """Write a new value into the nodes of an entry that already exists.
 
         Args:
@@ -84,7 +84,9 @@ class ConfigStore:
             value (Any): The new value: a scalar, or a whole list of the same length.
 
         Returns:
-            tuple[Tree, ...]: The value-type rule nodes now holding the value.
+            tuple[Tree | None, ...]: The value-type rule nodes now holding the value.
+                ``None`` where an array position no entry wrote has no node to hold one,
+                as in ``EntryRef.value_nodes``.
 
         Raises:
             TypeError: If the new value's type does not match what the entry holds.
@@ -102,7 +104,11 @@ class ConfigStore:
         else:
             if ref.category != KEY_VALUE:
                 raise TypeError(f"Trying to change the type of variable '{key}'")
-            update_node_value(ref.value_nodes[0], value)
+            node = ref.value_nodes[0]
+            # A None node means an array position the file never wrote, which only a
+            # key_list entry can have; a key_value always has the one node it names.
+            assert node is not None
+            update_node_value(node, value)
         return ref.value_nodes
 
     def add(self, key: str, raw_key: str, value: Any) -> EntryRef: