Mercurial > hgrepos > Python > libs > ConfigMix

changeset 350:9d729c479dc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Do not apply the type convertion None -> "" if the expansions comprises the whole expression
author Franz Glasner <f.glasner@feldmann-mg.com>
date Thu, 24 Jun 2021 19:22:53 +0200
parents 83f76a41cf7c
children efbf7ba40287
files configmix/config.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/config.py	Thu Jun 24 09:33:22 2021 +0200
+++ b/configmix/config.py	Thu Jun 24 19:22:53 2021 +0200
@@ -357,14 +357,14 @@
                               UserWarning,
                               stacklevel=1)
                 raise
-            if varvalue is None:
-                varvalue = u("")
             #
-            # Dont apply and type conversions to str if the whole `s` is
-            # just one expansion
+            # Dont apply and type conversions to the variable value if
+            # the whole `s` is just one expansion
             #
             if (start == 0) and (end + 2 == len(s)):
                 return varvalue
+            if varvalue is None:
+                varvalue = u("")
             replaced = s[:start] + u(str(varvalue))
             s = replaced + s[end+2:]
             # don't re-evaluate because `self.getvar_s()` expands already