# HG changeset patch # User Franz Glasner # Date 1639936903 -3600 # Node ID 085962f6c81f038f6ab65c125c9434bde808b72b # Parent 6b3da9e5acc649bafffb809eb1d92698b32457b8 Configuration._split_filters() now does the special filter check for None and Empty also diff -r 6b3da9e5acc6 -r 085962f6c81f configmix/config.py --- a/configmix/config.py Sun Dec 19 18:53:32 2021 +0100 +++ b/configmix/config.py Sun Dec 19 19:01:43 2021 +0100 @@ -651,12 +651,15 @@ if sep: filters = filters.strip() if filters: + filters = filters.split(_FILTER_SEPARATOR) return (name.rstrip(), - filters.split(_FILTER_SEPARATOR)) + filters, + NONE_FILTER in filters, + EMPTY_FILTER in filters) else: - return (name.rstrip(), []) + return (name.rstrip(), [], False, False) else: - return (name, []) + return (name, [], False, False) def _lookupvar(self, *path): """Lookup a variable within a hierarchy. @@ -773,12 +776,13 @@ if end < 0: rest = start break - varname, filters = self._split_filters(s[start+2:end]) + varname, filters, none_filter, empty_filter = self._split_filters( + s[start+2:end]) try: - if NONE_FILTER in filters: + if none_filter: varvalue = self._apply_filters( filters, self.getvar_s(varname, default=None)) - elif EMPTY_FILTER in filters: + elif empty_filter: varvalue = self._apply_filters( filters, self.getvar_s(varname, default=_EMPTY_STR))