minor simplifications

omry · Apr 23, 2020 · 1aed8a3 · 1aed8a3
1 parent e3baa45
commit 1aed8a3
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/omegaconf/dictconfig.py b/omegaconf/dictconfig.py
@@ -136,9 +136,7 @@ def _validate_set_merge_impl(self, key: Any, value: Any, is_assign: bool) -> Non
         from omegaconf import OmegaConf
 
         vk = get_value_kind(value)
-        if vk == ValueKind.INTERPOLATION:
-            return
-        if isinstance(value, (str, ValueNode)) and vk == ValueKind.STR_INTERPOLATION:
+        if vk in (ValueKind.INTERPOLATION, ValueKind.STR_INTERPOLATION):
             return
 
         if OmegaConf.is_none(value):
@@ -157,10 +155,6 @@ def _validate_set_merge_impl(self, key: Any, value: Any, is_assign: bool) -> Non
         if value == "???":
             return
 
-        # validate get
-        if key is not None:
-            self._validate_get(key, value)
-
         target: Optional[Node]
         if key is None:
             target = self
@@ -248,7 +242,6 @@ def _s_validate_and_normalize_key(
             assert False
 
     def __setitem__(self, key: Union[str, Enum], value: Any) -> None:
-
         try:
             self.__set_impl(key=key, value=value)
         except AttributeError as e: