minor: cleanr usage of flag_override in DictConfig and ListConfig

omry · Mar 9, 2021 · cfdc972 · cfdc972
1 parent b7b90c3
commit cfdc972
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/omegaconf/dictconfig.py b/omegaconf/dictconfig.py
@@ -641,10 +641,9 @@ def _set_value_impl(
                 self._metadata.flags = copy.deepcopy(flags)
                 # disable struct and readonly for the construction phase
                 # retaining other flags like allow_objects. The real flags are restored at the end of this function
-                with flag_override(self, "struct", False):
-                    with flag_override(self, "readonly", False):
-                        for k, v in value.__dict__["_content"].items():
-                            self.__setitem__(k, v)
+                with flag_override(self, ["struct", "readonly"], False):
+                    for k, v in value.__dict__["_content"].items():
+                        self.__setitem__(k, v)
 
             elif isinstance(value, dict):
                 for k, v in value.items():

diff --git a/omegaconf/listconfig.py b/omegaconf/listconfig.py
@@ -593,10 +593,9 @@ def _set_value_impl(
                 self._metadata.flags = copy.deepcopy(flags)
                 # disable struct and readonly for the construction phase
                 # retaining other flags like allow_objects. The real flags are restored at the end of this function
-                with flag_override(self, "struct", False):
-                    with flag_override(self, "readonly", False):
-                        for item in value._iter_ex(resolve=False):
-                            self.append(item)
+                with flag_override(self, ["struct", "readonly"], False):
+                    for item in value._iter_ex(resolve=False):
+                        self.append(item)
             elif is_primitive_list(value):
                 for item in value:
                     self.append(item)