[Erp5-report] r36506 ivan - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 22 14:05:02 CEST 2010
Author: ivan
Date: Tue Jun 22 14:04:59 2010
New Revision: 36506
URL: http://svn.erp5.org?rev=36506&view=rev
Log:
Use constant for embedded format.
Modified:
erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=36506&r1=36505&r2=36506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Tue Jun 22 14:04:59 2010
@@ -57,6 +57,7 @@ enc=base64.encodestring
dec=base64.decodestring
_MARKER = []
+EMBEDDED_FORMAT = '_embedded'
class TimeoutTransport(SafeTransport):
"""A xmlrpc transport with configurable timeout.
@@ -462,7 +463,7 @@ class OOoDocument(PermanentURLMixIn, Bas
else:
mime = guess_content_type(file_name)[0]
data = Pdata(zip_file.read(file_name))
- self.setConversion(data, mime=mime, format='_embedded', file_name=file_name)
+ self.setConversion(data, mime=mime, format=EMBEDDED_FORMAT, file_name=file_name)
if must_close:
zip_file.close()
archive_file.close()
@@ -473,9 +474,9 @@ class OOoDocument(PermanentURLMixIn, Bas
try:
self._convert(format='html')
web_cache_kw = {'name': name,
- 'format': '_embedded'}
+ 'format': EMBEDDED_FORMAT}
_setCacheHeaders(_ViewEmulator().__of__(self), web_cache_kw)
- mime, data = self.getConversion(format='_embedded', file_name=name)
+ mime, data = self.getConversion(format=EMBEDDED_FORMAT, file_name=name)
return OFSFile(name, name, data, content_type=mime).__of__(self.aq_parent)
except (NotConvertedError, ConversionError, KeyError):
return PermanentURLMixIn._getExtensibleContent(self, request, name)
More information about the Erp5-report
mailing list