From cfdc9727b307117adc1c72720d0e2827a4a82a61 Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Tue, 9 Mar 2021 14:23:43 -0800 Subject: [PATCH] minor: cleanr usage of flag_override in DictConfig and ListConfig --- omegaconf/dictconfig.py | 7 +++---- omegaconf/listconfig.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/omegaconf/dictconfig.py b/omegaconf/dictconfig.py index dd6a0c330..09a1d6833 100644 --- 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 index 7829c6c5a..eca2c44bb 100644 --- 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)