Tag interpolation

[char101]

Tag interpolation [jade issue] [jade commit]

mixin test(tag)
  #{tag} text

+test('div')

Also fix a bug in ext/html.py

def _make_mixin(self, mixin):
    arg_names = [arg.strip() for arg in mixin.args.split(",")]
    def _mixin(self, args):
        if args:
            arg_values = self._do_eval(args)
        else:
            arg_values = []
        if not isinstance(arg_values, (list, tuple)):
            arg_values = [arg_values]
        local_context = dict(zip(arg_names, arg_values))
        with local_context_manager(self, local_context):
            self.visitBlock(mixin.block)
    return _mixin

If arg_values is a string, then local_context will map the parameters into the characters of the string instead of the string value.

[smaudet]

I confirmed that at least one extension is broken, and added a test case.

I have merged this locally and will re-issue a new PR with test-cases/fixes.

[char101]

RE_BLOCK = re.compile(r'''^block(( +(?:(prepend|append) +)?([^\n]*))|(?=\n))''')

Changed \n at the end to be a lookahead, otherwise the else statement in the example below will not be parsed as a conditional.

mixin test(a)
  if a
    block
  else
    block

[kakulukia]

Since there are no updates to pyjade and its successor recently was deleted from pypi, I took the liberty to revive it: https://github.com/kakulukia/pypugjs

Version 5.0.1 has fixed the incompatibility with recent Django versions.

I have never really worked with mixins so far because i found no clever way of using them in extended templates and thus keep using partials instead. I'd be happy to include this fix in a new release tho if you resubmit the PR to my repo.