Fixed assigment of container to itself (#466)

omry · Dec 20, 2020 · 1fa65fa · 1fa65fa
2 parents e6d53e0 + 92fcb39
commit 1fa65fa
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/news/449.bugfix b/news/449.bugfix
@@ -0,0 +1 @@
+Fix assignment of a Container to itself causing it to clear it's content
diff --git a/omegaconf/dictconfig.py b/omegaconf/dictconfig.py
@@ -574,6 +574,9 @@ def _set_value_impl(
     ) -> None:
         from omegaconf import OmegaConf, flag_override
 
+        if id(self) == id(value):
+            return
+
         if flags is None:
             flags = {}
 

diff --git a/omegaconf/listconfig.py b/omegaconf/listconfig.py
@@ -516,6 +516,9 @@ def _set_value_impl(
     ) -> None:
         from omegaconf import OmegaConf, flag_override
 
+        if id(self) == id(value):
+            return
+
         if flags is None:
             flags = {}
 

diff --git a/tests/test_basic_ops_dict.py b/tests/test_basic_ops_dict.py
@@ -758,3 +758,16 @@ def test_setdefault() -> None:
     assert cfg["foo"] == 10
 
     assert cfg["foo"] == 10
+
+
+@pytest.mark.parametrize(  # type: ignore
+    "c",
+    [
+        pytest.param({"a": ListConfig([1, 2, 3], ref_type=list)}, id="list_value"),
+        pytest.param({"a": DictConfig({"b": 10}, ref_type=dict)}, id="dict_value"),
+    ],
+)
+def test_self_assign_list_value_with_ref_type(c: Any) -> None:
+    cfg = OmegaConf.create(c)
+    cfg.a = cfg.a
+    assert cfg == c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix assignment of a Container to itself causing it to clear it's content