# HG changeset patch # User Franz Glasner # Date 1601733150 -7200 # Node ID e2fd8fea1a4cd7f307edcb0e05848caba785bf9f # Parent 90bbade12d8ebe7b4b650c398c093ae328974582 Docu: more local lookup diff -r 90bbade12d8e -r e2fd8fea1a4c configmix/__init__.py --- a/configmix/__init__.py Sat Oct 03 15:50:41 2020 +0200 +++ b/configmix/__init__.py Sat Oct 03 15:52:30 2020 +0200 @@ -96,7 +96,7 @@ def safe_load(*files, **kwargs): """Analogous to :func:`load` but do merging with :func:`safe_merge` - instead of :func:`merge` + instead of :func:`.merge` """ defaults = kwargs.get("defaults") @@ -439,7 +439,7 @@ def _merge(user, default, filter_comments): - """Recursion helper for :func:`merge` + """Recursion helper for :func:`.merge` """ if isinstance(user, dict) and isinstance(default, dict): @@ -454,10 +454,10 @@ def safe_merge(user, default, filter_comments=True): - """A more safe version of :func:`merge` that makes deep copies of + """A more safe version of :func:`.merge` that makes deep copies of the returned container objects. - Contrary to :func:`merge` no given argument is ever changed + Contrary to :func:`.merge` no given argument is ever changed inplace. Every object from `default` is decoupled from the result -- so changing the `default` configuration later does not propagate into a merged configuration later.