Python/libs/ConfigMix: configmix/config.py comparison

comparison configmix/config.py @ 502:4f90e1eb7af8

Make quote() and unquote() module globals and also export from configmix

author	Franz Glasner <fzglas.hg@dom66.de>
date	Sat, 18 Dec 2021 01:26:41 +0100
parents	34cd4f111134
children	a56f1d97a3f3

comparison

equal deleted inserted replaced

-:1c83389fb8dd
+:4f90e1eb7af8
 """Mostly used configuration key characters that do not need any quoting
 """
+def quote(s):
+"""Replace important special characters in string `s` by replacing
+them with ``%xNN`` where `NN` are the two hexadecimal digits of the
+characters unicode codepoint value.
+Handled are the important special chars: ``%``, ``.``, ``:``,
+``#``; ``'``, ``"``, ``|``, ``{``, ``}``, ``[`` and ``]``.
+See also the :ref:`quoting` section.
+"""
+# Quick check whether all of the chars are in _QUOTE_SAFE
+if not s.rstrip(_QUOTE_SAFE):
+return s
+# Slow path
+re_encode = False
+if PY2:
+# Use the Unicode translation variant in PY2
+if isinstance(s, str):
+s = s.decode("latin1")
+re_encode = True
+s = s.translate(_QUOTE_MAP)
+if re_encode:
+return s.encode("latin1")
+else:
+return s
+def unquote(s):
+"""Unquote the content of `s`: handle all patterns ``%xNN``,
+``%uNNNN`` or ``%UNNNNNNNN``.
+This is the inverse of :func:`.quote`.
+"""
+if _QUOTE not in s:
+return s
+parts = s.split(_QUOTE)
+res = [parts[0]]
+res_append = res.append
+for p in parts[1:]:
+try:
+qc = p[0]
+except IndexError:
+raise ValueError("unknown quote syntax string: {}".format(s))
+if qc == _QUOTE_x:
+if len(p) < 3:
+raise ValueError("quote syntax: length too small")
+res_append(uchr(int(p[1:3], 16)))
+res_append(p[3:])
+elif qc == _QUOTE_u:
+if len(p) < 5:
+raise ValueError("quote syntax: length too small")
+res_append(uchr(int(p[1:5], 16)))
+res_append(p[5:])
+elif qc == _QUOTE_U:
+if len(p) < 9:
+raise ValueError("quote syntax: length too small")
+res_append(uchr(int(p[1:9], 16)))
+res_append(p[9:])
+else:
+raise ValueError("unknown quote syntax string: {}".format(s))
+return _EMPTY_STR.join(res)
 class Configuration(CoercingMethodsMixin, _AttributeDict):
 """The configuration dictionary with attribute support or
 variable substitution.
 No variable interpolation is done and no filters are applied.
 Special characters (e.g. ``:`` and ``.``) must be quoted when using
 the default namespace.
-See also :meth:`~.quote`.
+See also :func:`.quote`.
 """
 varns, varname = self._split_ns(varname)
 if not varns:
 if varname:
 varnameparts = [
-self.unquote(vp)
+unquote(vp)
 for vp in varname.split(_HIER_SEPARATOR)
 ]
 else:
 varnameparts = tuple()
 else:
 return default
 def _split_ns(self, s):
 ns, sep, rest = s.partition(_NS_SEPARATOR)
 if sep:
-return (self.unquote(ns), rest)
+return (unquote(ns), rest)
 else:
 return (None, ns)
 def _split_filters(self, s):
 name, sep, filters = s.partition(_FILTER_SEPARATOR)
 raise NameError("Filter %r not found" % name)
 else:
 value = filterfn(self, value)
 return value
-@staticmethod
-def quote(s):
-"""Replace important special characters in string `s` by replacing
-them with ``%xNN`` where `NN` are the two hexadecimal digits of the
-characters unicode codepoint value.
-Handled are the important special chars: ``%``, ``.``, ``:``,
-``#``; ``'``, ``"``, ``|``, ``{``, ``}``, ``[`` and ``]``.
-See also the :ref:`quoting` section.
-"""
-# Quick check whether all of the chars are in _QUOTE_SAFE
-if not s.rstrip(_QUOTE_SAFE):
-return s
-# Slow path
-re_encode = False
-if PY2:
-# Use the Unicode translation variant in PY2
-if isinstance(s, str):
-s = s.decode("latin1")
-re_encode = True
-s = s.translate(_QUOTE_MAP)
-if re_encode:
-return s.encode("latin1")
-else:
-return s
-@staticmethod
-def unquote(s):
-"""Unquote the content of `s`: handle all patterns ``%xNN``,
-``%uNNNN`` or ``%UNNNNNNNN``.
-This is the inverse of :meth:`~.quote`.
-"""
-if _QUOTE not in s:
-return s
-parts = s.split(_QUOTE)
-res = [parts[0]]
-res_append = res.append
-for p in parts[1:]:
-try:
-qc = p[0]
-except IndexError:
-raise ValueError("unknown quote syntax string: {}".format(s))
-if qc == _QUOTE_x:
-if len(p) < 3:
-raise ValueError("quote syntax: length too small")
-res_append(uchr(int(p[1:3], 16)))
-res_append(p[3:])
-elif qc == _QUOTE_u:
-if len(p) < 5:
-raise ValueError("quote syntax: length too small")
-res_append(uchr(int(p[1:5], 16)))
-res_append(p[5:])
-elif qc == _QUOTE_U:
-if len(p) < 9:
-raise ValueError("quote syntax: length too small")
-res_append(uchr(int(p[1:9], 16)))
-res_append(p[9:])
-else:
-raise ValueError("unknown quote syntax string: {}".format(s))
-return _EMPTY_STR.join(res)
 def jailed(self, rootpath=None, root=None, bind_root=True):
 """Return a "jailed" configuration of the current configuration.
 :param rootpath: a sequence of strings that shall emcompass
 the chroot-like jail of the returned
 if varns:
 raise ValueError(
 "jailed configurations do not support namespaces")
 if varname:
 rootpath = [
-self.unquote(p) for p in root.split(
+unquote(p) for p in root.split(_HIER_SEPARATOR)
-_HIER_SEPARATOR)
 ]
 else:
 rootpath = tuple()
 jc = _JailedConfiguration(*rootpath)
 if bind_root:
 super(_JailedConfiguration, self).__init__()
 self._path = path
 if path:
 self._pathstr = \
 _HIER_SEPARATOR.join(
-[Configuration.quote(p) for p in path]) \
+[quote(p) for p in path]) \
 + _HIER_SEPARATOR
 else:
 self._pathstr = _EMPTY_STR
 @property
 if varns:
 raise ValueError(
 "sub-jails do not support namespaces")
 if varname:
 rootpath = [
-self._base.unquote(p) for p in varname.split(
+unquote(p) for p in varname.split(_HIER_SEPARATOR)
-_HIER_SEPARATOR)
 ]
 else:
 rootpath = tuple()
 if self._path:
 new_rootpath = self._path + tuple(rootpath)

Mercurial > hgrepos > Python > libs > ConfigMix

comparison configmix/config.py @ 502:4f90e1eb7af8