Commit e2a3716d authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

convert path to ascii before calling _resolvePath().

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15368 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ec9d9052
...@@ -223,7 +223,7 @@ class OOoTemplate(ZopePageTemplate): ...@@ -223,7 +223,7 @@ class OOoTemplate(ZopePageTemplate):
def replaceIncludes(match): def replaceIncludes(match):
options_dict = dict( style="fr1", x="0cm", y="0cm" ) options_dict = dict( style="fr1", x="0cm", y="0cm" )
options_dict.update( dict(arguments_re.findall( match.group(1) )) ) options_dict.update( dict(arguments_re.findall( match.group(1) )) )
document = self._resolvePath( options_dict['path'] ) document = self._resolvePath( options_dict['path'].encode() )
#document_text = document.read() #document_text = document.read()
document_text = ZopePageTemplate.pt_render(document) # extra_context is missing document_text = ZopePageTemplate.pt_render(document) # extra_context is missing
...@@ -306,7 +306,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -306,7 +306,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
def replaceIncludesImg(match): def replaceIncludesImg(match):
options_dict = dict( x='0cm', y='0cm', style="fr1" ) options_dict = dict( x='0cm', y='0cm', style="fr1" )
options_dict.update( dict(arguments_re.findall( match.group(1) )) ) options_dict.update( dict(arguments_re.findall( match.group(1) )) )
picture = self._resolvePath( options_dict['path'] ) picture = self._resolvePath( options_dict['path'].encode() )
# "standard" filetype == Image or File , for ERP objects the # "standard" filetype == Image or File , for ERP objects the
# manipulations are different # manipulations are different
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment