From dd77f0d6892d75c65c9a11106f2ec3662c136c60 Mon Sep 17 00:00:00 2001 From: M Bussonnier Date: Sat, 1 Aug 2026 13:13:54 +0200 Subject: [PATCH] Re-add _merge to un-break spyder temporarily. --- traitlets/config/loader.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/traitlets/config/loader.py b/traitlets/config/loader.py index 45930cce4..baaa4eaff 100644 --- a/traitlets/config/loader.py +++ b/traitlets/config/loader.py @@ -245,6 +245,18 @@ def _ensure_subconfig(self) -> None: if _is_section_key(key) and isinstance(obj, dict) and not isinstance(obj, Config): setattr(self, key, Config(obj)) + def _merge(self, other: t.Any) -> None: + """deprecated alias, since traitlets 4.0 - 2015 use Config.merge()""" + # re-added in August 2026 because of Spyder + import warnings + + warnings.warn( + "_merge has been deprecated since traitlets 4.0 - 2015, please use `merge()`", + DeprecationWarning, + stacklevel=2, + ) + self.merge(other) + def merge(self, other: t.Any) -> None: """merge another config object into this one""" to_update = {}