Mercurial > hgrepos > Python > libs > ConfigMix
diff configmix/config.py @ 480:3cfc808e613b
Because we are Pytho 2.6+ remove some compatibility code for pre-Python 2.6
| author | Franz Glasner <f.glasner@feldmann-mg.com> |
|---|---|
| date | Fri, 17 Dec 2021 12:49:07 +0100 |
| parents | 490f0c4665bb |
| children | e3990ec55f2a |
line wrap: on
line diff
--- a/configmix/config.py Fri Dec 17 11:52:56 2021 +0100 +++ b/configmix/config.py Fri Dec 17 12:49:07 2021 +0100 @@ -532,39 +532,23 @@ return default def _split_ns(self, s): - try: - ns, sep, rest = s.partition(self._NS_SEPARATOR) - if sep: - return (self.unquote(ns), rest) - else: - return (None, ns) - except AttributeError: - # pre PY 2.5 - nameparts = s.split(self._NS_SEPARATOR, 1) - if len(nameparts) == 1: - return (None, s, ) - else: - return (self.unquote(nameparts[0]), nameparts[1], ) + ns, sep, rest = s.partition(self._NS_SEPARATOR) + if sep: + return (self.unquote(ns), rest) + else: + return (None, ns) def _split_filters(self, s): - try: - name, sep, filters = s.partition(self._FILTER_SEPARATOR) - if sep: - filters = filters.strip() - if filters: - return (name.rstrip(), - filters.split(self._FILTER_SEPARATOR)) - else: - return (name.rstrip(), []) + name, sep, filters = s.partition(self._FILTER_SEPARATOR) + if sep: + filters = filters.strip() + if filters: + return (name.rstrip(), + filters.split(self._FILTER_SEPARATOR)) else: - return (name, []) - except AttributeError: - # pre PY 2.5 - nameparts = s.split(self._FILTER_SEPARATOR) - if len(nameparts) == 1: - return (s, [], ) - else: - return (nameparts[0].rstrip(), nameparts[1:], ) + return (name.rstrip(), []) + else: + return (name, []) def _lookupvar(self, *path, **kwds): """Lookup a variable within a hierarchy.