comparison 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
comparison
equal deleted inserted replaced
479:490f0c4665bb 480:3cfc808e613b
530 "none of the given variables found: %r" % (varnames,)) 530 "none of the given variables found: %r" % (varnames,))
531 else: 531 else:
532 return default 532 return default
533 533
534 def _split_ns(self, s): 534 def _split_ns(self, s):
535 try: 535 ns, sep, rest = s.partition(self._NS_SEPARATOR)
536 ns, sep, rest = s.partition(self._NS_SEPARATOR) 536 if sep:
537 if sep: 537 return (self.unquote(ns), rest)
538 return (self.unquote(ns), rest) 538 else:
539 else: 539 return (None, ns)
540 return (None, ns)
541 except AttributeError:
542 # pre PY 2.5
543 nameparts = s.split(self._NS_SEPARATOR, 1)
544 if len(nameparts) == 1:
545 return (None, s, )
546 else:
547 return (self.unquote(nameparts[0]), nameparts[1], )
548 540
549 def _split_filters(self, s): 541 def _split_filters(self, s):
550 try: 542 name, sep, filters = s.partition(self._FILTER_SEPARATOR)
551 name, sep, filters = s.partition(self._FILTER_SEPARATOR) 543 if sep:
552 if sep: 544 filters = filters.strip()
553 filters = filters.strip() 545 if filters:
554 if filters: 546 return (name.rstrip(),
555 return (name.rstrip(), 547 filters.split(self._FILTER_SEPARATOR))
556 filters.split(self._FILTER_SEPARATOR)) 548 else:
557 else: 549 return (name.rstrip(), [])
558 return (name.rstrip(), []) 550 else:
559 else: 551 return (name, [])
560 return (name, [])
561 except AttributeError:
562 # pre PY 2.5
563 nameparts = s.split(self._FILTER_SEPARATOR)
564 if len(nameparts) == 1:
565 return (s, [], )
566 else:
567 return (nameparts[0].rstrip(), nameparts[1:], )
568 552
569 def _lookupvar(self, *path, **kwds): 553 def _lookupvar(self, *path, **kwds):
570 """Lookup a variable within a hierarchy. 554 """Lookup a variable within a hierarchy.
571 555
572 If no default is given an unexisting `path` raises a `KeyError` 556 If no default is given an unexisting `path` raises a `KeyError`