Tests for namespace nested parameter

Author: mauvilsa

jsonargparse/_namespace.py

@@ -236,22 +236,20 @@ def as_flat(self) -> argparse.Namespace:
     def items(self, branches: bool = False, nested: bool = True) -> Iterator[Tuple[str, Any]]:
         """Returns a generator of all leaf (key, value) items, optionally including branches."""
         for key, val in vars(self).items():
-            if not nested and "." in key:
-                continue
             key = del_clash_mark(key)
             if isinstance(val, Namespace):
                 if branches:
                     yield key, val
+                if not nested:
+                    continue
                 for subkey, subval in val.items(branches):
                     yield key + "." + del_clash_mark(subkey), subval
             else:
                 yield key, val
 
     def keys(self, branches: bool = False, nested: bool = True) -> Iterator[str]:
         """Returns a generator of all leaf keys, optionally including branches."""
-        for key, _ in self.items(branches):
-            if not nested and "." in key:
-                continue
+        for key, _ in self.items(branches=branches, nested=nested):
             yield key
 
     def values(self, branches: bool = False) -> Iterator[Any]:

jsonargparse_tests/test_namespace.py

@@ -296,3 +296,35 @@ def test_add_argument_meta_key_error(meta_key, parser):
     with pytest.raises(ValueError) as ctx:
         parser.add_argument(meta_key)
     ctx.match(f'"{meta_key}" not allowed')
+
+
+def test_items_branches_nested():
+    ns = Namespace()
+    ns["a.b"] = 1
+    ns["a.c"] = 2
+    ns["d"] = 3
+
+    items = list(ns.items(branches=True))
+    assert items == [("a", Namespace(b=1, c=2)), ("a.b", 1), ("a.c", 2), ("d", 3)]
+
+    items = list(ns.items(branches=True, nested=False))
+    assert items == [("a", Namespace(b=1, c=2)), ("d", 3)]
+
+    items = list(ns.items(nested=False))
+    assert items == [("d", 3)]
+
+
+def test_keys_branches_nested():
+    ns = Namespace()
+    ns["a.b"] = 1
+    ns["a.c"] = 2
+    ns["d"] = 3
+
+    keys = list(ns.keys(branches=True))
+    assert keys == ["a", "a.b", "a.c", "d"]
+
+    keys = list(ns.keys(branches=True, nested=False))
+    assert keys == ["a", "d"]
+
+    keys = list(ns.keys(nested=False))
+    assert keys == ["d"]