[Erp5-report] r13479 - in /erp5/trunk/products/ERP5OOo: Document/ tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Mar 18 18:41:09 CET 2007
Author: jp
Date: Sun Mar 18 18:41:07 2007
New Revision: 13479
URL: http://svn.erp5.org?rev=13479&view=rev
Log:
Renamed convertToBase to convertToBaseFormat
Modified:
erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
erp5/trunk/products/ERP5OOo/tests/testIngestion.py
Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=13479&r1=13478&r2=13479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py Sun Mar 18 18:41:07 2007
@@ -149,7 +149,7 @@
"""
self.log(format, force)
if (not self.hasOOFile()) or force:
- self.convertToBase()
+ self.convertToBaseFormat()
if format is None:
result = self.getOOFile()
mime = self.getMimeType()
@@ -261,7 +261,7 @@
return True # XXX why return ? - why not?
security.declarePrivate('_convertToBase')
- def _convertToBase(self):
+ def _convertToBaseFormat(self):
"""
Converts the original document into ODF
by invoking the conversion server. Store the result
@@ -423,7 +423,7 @@
"""
# first check if we have base
if not self.hasOOFile():
- self.convertToBase()
+ self.convertToBaseFormat()
if not self.isAllowed(format):
if REQUEST is not None:
return self.returnMessage('can not convert to ' + format + ' for some reason',1)
Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=13479&r1=13478&r2=13479&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py Sun Mar 18 18:41:07 2007
@@ -299,7 +299,7 @@
filename = 'TEST-en-002.' + format
f = makeFileUpload(filename)
context.edit(file=f)
- context.convertToBase()
+ context.convertToBaseFormat()
context.reindexObject(); get_transaction().commit(); self.tic()
self.failUnless(context.hasFile())
if context.getPortalType() in ('Image', 'File'): # these are not subject to conversion
@@ -318,7 +318,7 @@
filename = 'TEST-en-002.' + format
f = makeFileUpload(filename)
context.edit(file=f)
- context.convertToBase()
+ context.convertToBaseFormat()
context.reindexObject(); get_transaction().commit(); self.tic()
clearCache()
target_list = [x[1] for x in context.getTargetFormatItemList()]
More information about the Erp5-report
mailing list