Mercurial > genshi > mirror
changeset 310:a867f4a10d12 trunk
Embedded expressions didn't have their absolute filename set.
author | cmlenz |
---|---|
date | Tue, 17 Oct 2006 14:42:27 +0000 |
parents | c91c3c04e9cd |
children | 8de1ff534d22 |
files | genshi/template.py |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/template.py +++ b/genshi/template.py @@ -842,15 +842,17 @@ @param offset: the column number at which the text starts in the source (optional) """ - def _interpolate(text, patterns, filename=filename, lineno=lineno, - offset=offset): + filepath = filename + if filepath and basedir: + filepath = os.path.join(basedir, filepath) + def _interpolate(text, patterns, lineno=lineno, offset=offset): for idx, grp in enumerate(patterns.pop(0).split(text)): if idx % 2: try: - yield EXPR, Expression(grp.strip(), filename, lineno), \ + yield EXPR, Expression(grp.strip(), filepath, lineno), \ (filename, lineno, offset) except SyntaxError, err: - raise TemplateSyntaxError(err, filename, lineno, + raise TemplateSyntaxError(err, filepath, lineno, offset + (err.offset or 0)) elif grp: if patterns: