mercurial-scm/hg: mercurial/templateutil.py comparison

templater: drop hybrid-ness on unwrapvalue() Proxy methods are no longer necessary as list/dict functions go through the wrapped interface.

comparison

equal deleted inserted replaced

-:49ef1539b84e
+:cf8d210dfac4
 if callable(gen):
 return gen()
 return gen
 def tovalue(self, context, mapping):
-# TODO: return self._values and get rid of proxy methods
+# TODO: make it non-recursive for trivial lists/dicts
-return self
+xs = self._values
+if util.safehasattr(xs, 'get'):
-def __contains__(self, x):
+return {k: unwrapvalue(context, mapping, v)
-return x in self._values
+for k, v in xs.iteritems()}
-def __getitem__(self, key):
+return [unwrapvalue(context, mapping, x) for x in xs]
-return self._values[key]
-def __len__(self):
-return len(self._values)
-def __iter__(self):
-return iter(self._values)
-def __getattr__(self, name):
-if name not in (r'get', r'items', r'iteritems', r'iterkeys',
-r'itervalues', r'keys', r'values'):
-raise AttributeError(name)
-return getattr(self._values, name)
 class mappable(wrapped):
 """Wrapper for non-list/dict object to support map operation
 This class allows us to handle both:
 - "{manifest}"
 - "{manifest % '{rev}:{node}'}"
 - "{manifest.rev}"
-Unlike a hybrid, this does not simulate the behavior of the underling
-value.
 """
 def __init__(self, gen, key, value, makemap):
 self._gen = gen  # generator or function returning generator
 self._key = key

Mercurial > public > mercurial-scm > hg