Fix a bug merging into a field annotated as Optional[List[int]] = None

omry · Nov 3, 2020 · 19da4a4 · 19da4a4
1 parent 677956d
commit 19da4a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/news/428.bugfix b/news/428.bugfix
@@ -0,0 +1 @@
+Fix a bug merging into a field annotated as Optional[List[int]] = None
diff --git a/omegaconf/basecontainer.py b/omegaconf/basecontainer.py
@@ -349,6 +349,8 @@ def _merge_with(
 
                 if other._is_missing():
                     self._set_value("???")
+                elif other._is_none():
+                    self._set_value(None)
                 else:
                     et = self._metadata.element_type
                     if is_structured_config(et):

diff --git a/tests/structured_conf/test_structured_config.py b/tests/structured_conf/test_structured_config.py
@@ -936,6 +936,8 @@ def test_merge_into_none_list(self, class_type: str) -> None:
             "not_optional": [1, 2, 3],
         }
 
+        assert OmegaConf.merge(cfg, cfg) == cfg
+
     def test_merge_into_none_dict(self, class_type: str) -> None:
         module: Any = import_module(class_type)
         cfg = OmegaConf.structured(module.DictOptional)
@@ -945,6 +947,8 @@ def test_merge_into_none_dict(self, class_type: str) -> None:
             "not_optional": {"a": 10},
         }
 
+        assert OmegaConf.merge(cfg, cfg) == cfg
+
     @pytest.mark.parametrize(  # type: ignore
         "update_value,expected",
         [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug merging into a field annotated as Optional[List[int]] = None