[Erp5-report] r15368 - /erp5/trunk/products/ERP5OOo/OOoTemplate.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Jul 27 16:43:08 2007
New Revision: 15368

URL: http://svn.erp5.org?rev=15368&view=rev
Log:
convert path to ascii before calling _resolvePath().

Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=15368&r1=15367&r2=15368&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Fri Jul 27 16:43:08 2007
@@ -223,7 +223,7 @@
     def replaceIncludes(match):
       options_dict = dict( style="fr1", x="0cm", y="0cm" )
       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 = ZopePageTemplate.pt_render(document) # extra_context is missing
 
@@ -306,7 +306,7 @@
     def replaceIncludesImg(match):
       options_dict = dict( x='0cm', y='0cm', style="fr1" )
       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
       # manipulations are different