Mercurial > hgrepos > Python > libs > ConfigMix

changeset 490:ea4b7fac02d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reorder type comparisons by usage
author Franz Glasner <f.glasner@feldmann-mg.com>
date Fri, 17 Dec 2021 16:37:26 +0100
parents b49164db1273
children de776953337b
files configmix/config.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/config.py	Fri Dec 17 16:28:09 2021 +0100
+++ b/configmix/config.py	Fri Dec 17 16:37:26 2021 +0100
@@ -633,16 +633,16 @@
         if isinstance(obj, self._TEXTTYPE):
             # a string - really replace the value
             return self.expand_variable(obj)
+        elif isinstance(obj, dict):
+            newdict = type(obj)()
+            for k in obj:
+                newdict[k] = self.substitute_variables_in_obj(obj[k])
+            return newdict
         elif isinstance(obj, list):
             return [self.substitute_variables_in_obj(i) for i in obj]
         elif isinstance(obj, tuple):
             tmp = [self.substitute_variables_in_obj(i) for i in obj]
             return type(obj)(tmp)
-        elif isinstance(obj, dict):
-            newdict = type(obj)()
-            for k in obj:
-                newdict[k] = self.substitute_variables_in_obj(obj[k])
-            return newdict
         elif isinstance(obj, set):
             newset = type(obj)()
             for i in obj: