Mercurial > genshi > genshi-test
changeset 153:7a4086c22a64
Fix relative includes on Windows. Closes #27.
author | cmlenz |
---|---|
date | Wed, 16 Aug 2006 10:35:01 +0000 |
parents | 064ba1078f92 |
children | 1c404be518d1 |
files | ChangeLog markup/template.py |
diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -2,15 +2,17 @@ http://svn.edgewall.org/repos/markup/tags/0.2.0/ (?, from branches/stable/0.2.x) - * XPath syntax errors now contain position info (ticket #20) + * XPath syntax errors now contain position info (ticket #20). * Errors in expression evaluation now contain the correct line number in the - template (ticket #22) + template (ticket #22). * <script> and <style> element contents are no longer escaped when using HTML - serialization (ticket #24) - * In some cases expressions in templates did not get interpolated (ticket #26) + serialization (ticket #24). + * In some cases expressions in templates did not get interpolated (ticket + #26). * CDATA sections are now passed through the pipeline and serialized correctly. That allows using <script> or <style> elements in XHTML output that is still compatible with HTML user agents. + * Fixed relative includes in templates on Windows (ticket #27). * Output can be encoded using legacy codecs such as ISO-8859-1, any character not representable in the chosen encoding gets replaced by the corresponding XML character reference.
--- a/markup/template.py +++ b/markup/template.py @@ -21,7 +21,6 @@ def popleft(self): return self.pop(0) import compiler import os -import posixpath import re from StringIO import StringIO @@ -1052,7 +1051,7 @@ from markup.filters import IncludeFilter if relative_to: - filename = posixpath.join(posixpath.dirname(relative_to), filename) + filename = os.path.join(os.path.dirname(relative_to), filename) filename = os.path.normpath(filename) # First check the cache to avoid reparsing the same file