Mercurial > hgrepos > Python > libs > ConfigMix

changeset 488:298510ec8171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify logic by not using many negations
author Franz Glasner <f.glasner@feldmann-mg.com>
date Fri, 17 Dec 2021 16:17:17 +0100
parents d7f6f2afcee2
children b49164db1273
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:06:49 2021 +0100
+++ b/configmix/config.py	Fri Dec 17 16:17:17 2021 +0100
@@ -618,12 +618,12 @@
         """
         if not isinstance(v, self._TEXTTYPE):
             return v
-        if not v.startswith(self._STARTTOK_REF) \
-                or not v.endswith(self._ENDTOK_REF):
+        if v.startswith(self._STARTTOK_REF) and v.endswith(self._ENDTOK_REF):
+            return self.expand_ref_uri(
+                v[len(self._STARTTOK_REF):-len(self._ENDTOK_REF)],
+                default=default)
+        else:
             return v
-        return self.expand_ref_uri(
-            v[len(self._STARTTOK_REF):-len(self._ENDTOK_REF)],
-            default=default)
 
     def expand_ref_uri(self, uri, default=_MARKER):
         pu = urlsplit(uri)