Mercurial > hgrepos > Python > libs > ConfigMix
comparison configmix/config.py @ 488:298510ec8171
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 |
comparison
equal
deleted
inserted
replaced
| 487:d7f6f2afcee2 | 488:298510ec8171 |
|---|---|
| 616 unchanged. | 616 unchanged. |
| 617 | 617 |
| 618 """ | 618 """ |
| 619 if not isinstance(v, self._TEXTTYPE): | 619 if not isinstance(v, self._TEXTTYPE): |
| 620 return v | 620 return v |
| 621 if not v.startswith(self._STARTTOK_REF) \ | 621 if v.startswith(self._STARTTOK_REF) and v.endswith(self._ENDTOK_REF): |
| 622 or not v.endswith(self._ENDTOK_REF): | 622 return self.expand_ref_uri( |
| 623 v[len(self._STARTTOK_REF):-len(self._ENDTOK_REF)], | |
| 624 default=default) | |
| 625 else: | |
| 623 return v | 626 return v |
| 624 return self.expand_ref_uri( | |
| 625 v[len(self._STARTTOK_REF):-len(self._ENDTOK_REF)], | |
| 626 default=default) | |
| 627 | 627 |
| 628 def expand_ref_uri(self, uri, default=_MARKER): | 628 def expand_ref_uri(self, uri, default=_MARKER): |
| 629 pu = urlsplit(uri) | 629 pu = urlsplit(uri) |
| 630 if pu.scheme or pu.netloc or pu.path or pu.query: | 630 if pu.scheme or pu.netloc or pu.path or pu.query: |
| 631 raise ValueError("only fragment-only URIs are supported") | 631 raise ValueError("only fragment-only URIs are supported") |
