From aa3c98e3bb5a3059c4e8e12b87366bc0a8db6236 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 21 Mar 2013 11:54:26 -0400 Subject: [PATCH] - filename context added to template call in mako-render, so that inheritance chains and includes are located correctly, [ticket:202] --- scripts/mako-render | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mako-render b/scripts/mako-render index d4b54ea..690677d 100644 --- a/scripts/mako-render +++ b/scripts/mako-render @@ -1,11 +1,11 @@ #!/usr/bin/env python -def render(data, kw): +def render(data, filename, kw): from mako.template import Template from mako.lookup import TemplateLookup lookup = TemplateLookup(["."]) - return Template(data, lookup=lookup).render(**kw) + return Template(data, filename, lookup=lookup).render(**kw) def varsplit(var): if "=" not in var: @@ -28,7 +28,7 @@ def main(argv=None): opts, args = parser.parse_args(argv[1:]) if len(args) not in (0, 1): - parser.error("wrong number of arguments") # Will exit + parser.error("wrong number of arguments") # Will exit if (len(args) == 0) or (args[0] == "-"): fo = stdin @@ -40,7 +40,7 @@ def main(argv=None): kw = dict([varsplit(var) for var in opts.var]) data = fo.read() - print render(data, kw) + print render(data, filename, kw) if __name__ == "__main__": main()