[Erp5-report] r28411 - in /erp5/trunk/products/ERP5OOo: tests/ transforms/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Aug 17 13:41:05 2009
New Revision: 28411

URL: http://svn.erp5.org?rev=28411&view=rev
Log:
use Pdata.__str__() instead of _unpackData().

Modified:
    erp5/trunk/products/ERP5OOo/tests/testIngestion.py
    erp5/trunk/products/ERP5OOo/transforms/odt_to_doc.py
    erp5/trunk/products/ERP5OOo/transforms/odt_to_pdf.py
    erp5/trunk/products/ERP5OOo/transforms/odt_to_xml.py

Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=28411&r1=28410&r2=28411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] Mon Aug 17 13:41:05 2009
@@ -41,7 +41,6 @@
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5Type.tests.utils import FileUpload
 from Products.ERP5OOo.Document.OOoDocument import ConversionError
-from Products.ERP5.Document.File import _unpackData
 from zLOG import LOG, INFO, ERROR
 
 # Define the conversion server host
@@ -725,7 +724,7 @@
     context = self.getDocument('one')
     newcontent = context.getBaseData()
     cs = cStringIO.StringIO()
-    cs.write(_unpackData(newcontent))
+    cs.write(str(newcontent))
     z = zipfile.ZipFile(cs)
     s = z.read('meta.xml')
     xmlob = parseString(s)

Modified: erp5/trunk/products/ERP5OOo/transforms/odt_to_doc.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/odt_to_doc.py?rev=28411&r1=28410&r2=28411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/odt_to_doc.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/odt_to_doc.py [utf8] Mon Aug 17 13:41:05 2009
@@ -1,6 +1,5 @@
 from Products.PortalTransforms.interfaces import itransform
 from oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
-from Products.ERP5.Document.File import _unpackData
 from zLOG import LOG
 
 
@@ -26,7 +25,7 @@
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = _unpackData(orig)
+    data = str(orig)
     doc = OOOdCommandTransform(context, filename, data, self.inputs[0])
     doc.convert()
     msword = doc.convertTo('doc')

Modified: erp5/trunk/products/ERP5OOo/transforms/odt_to_pdf.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/odt_to_pdf.py?rev=28411&r1=28410&r2=28411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/odt_to_pdf.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/odt_to_pdf.py [utf8] Mon Aug 17 13:41:05 2009
@@ -1,6 +1,5 @@
 from Products.PortalTransforms.interfaces import itransform
 from oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
-from Products.ERP5.Document.File import _unpackData
 from zLOG import LOG
 
 
@@ -26,7 +25,7 @@
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = _unpackData(orig)
+    data = str(orig)
     doc = OOOdCommandTransform(context, filename, data, self.inputs[0])
     doc.convert()
     pdf = doc.convertTo('pdf')

Modified: erp5/trunk/products/ERP5OOo/transforms/odt_to_xml.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/odt_to_xml.py?rev=28411&r1=28410&r2=28411&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/odt_to_xml.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/odt_to_xml.py [utf8] Mon Aug 17 13:41:05 2009
@@ -1,6 +1,5 @@
 from Products.PortalTransforms.interfaces import itransform
 from oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
-from Products.ERP5.Document.File import _unpackData
 from zLOG import LOG
 from Products.ERP5OOo.OOoUtils import OOoBuilder
 import re
@@ -27,7 +26,7 @@
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = _unpackData(orig)
+    data = str(orig)
     doc = OOOdCommandTransform(context, filename, data, self.inputs[0])
     doc.convert()
     builder = OOoBuilder(doc)