Mercurial > hgrepos > Python > libs > ConfigMix
comparison configmix/config.py @ 357:dd454e1efea4
Use constants for the names of the "None" and "Empty" filters
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Thu, 24 Jun 2021 21:20:37 +0200 |
| parents | 2b209bdf6995 |
| children | 1941f0188e81 |
comparison
equal
deleted
inserted
replaced
| 356:a5c792074ec9 | 357:dd454e1efea4 |
|---|---|
| 27 except ImportError: | 27 except ImportError: |
| 28 from urlparse import urlsplit | 28 from urlparse import urlsplit |
| 29 | 29 |
| 30 from .variables import lookup_varns, lookup_filter | 30 from .variables import lookup_varns, lookup_filter |
| 31 from .compat import u, uchr | 31 from .compat import u, uchr |
| 32 from .constants import REF_NAMESPACE | 32 from .constants import REF_NAMESPACE, NONE_FILTER, EMPTY_FILTER |
| 33 | 33 |
| 34 | 34 |
| 35 _MARKER = object() | 35 _MARKER = object() |
| 36 | 36 |
| 37 | 37 |
| 343 end = s.find(self._ENDTOK, start) | 343 end = s.find(self._ENDTOK, start) |
| 344 if end < 0: | 344 if end < 0: |
| 345 return s | 345 return s |
| 346 varname, filters = self._split_filters(s[start+2:end]) | 346 varname, filters = self._split_filters(s[start+2:end]) |
| 347 try: | 347 try: |
| 348 if "None" in filters: | 348 if NONE_FILTER in filters: |
| 349 varvalue = self._apply_filters( | 349 varvalue = self._apply_filters( |
| 350 filters, self.getvar_s(varname, default=None)) | 350 filters, self.getvar_s(varname, default=None)) |
| 351 elif "Empty" in filters: | 351 elif EMPTY_FILTER in filters: |
| 352 varvalue = self._apply_filters( | 352 varvalue = self._apply_filters( |
| 353 filters, self.getvar_s(varname, default=u(""))) | 353 filters, self.getvar_s(varname, default=u(""))) |
| 354 else: | 354 else: |
| 355 varvalue = self._apply_filters( | 355 varvalue = self._apply_filters( |
| 356 filters, self.getvar_s(varname)) | 356 filters, self.getvar_s(varname)) |
