diff --git a/product/ERP5OOo/tests/testIngestion.py b/product/ERP5OOo/tests/testIngestion.py index 6691a0878cd7da16a81f62e0c4588b24f1e23c63..ab0f1f5f7df91cf64dbaa2ae3535ad0d4265e03a 100644 --- a/product/ERP5OOo/tests/testIngestion.py +++ b/product/ERP5OOo/tests/testIngestion.py @@ -41,7 +41,6 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase 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 @@ class TestIngestion(ERP5TypeTestCase): 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) diff --git a/product/ERP5OOo/transforms/odt_to_doc.py b/product/ERP5OOo/transforms/odt_to_doc.py index 2b2ce21a68ddc68f1969e0091f4200104c4fe1cc..441b709c909b4c84751a16ea93d9cc1857673a48 100644 --- a/product/ERP5OOo/transforms/odt_to_doc.py +++ b/product/ERP5OOo/transforms/odt_to_doc.py @@ -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 @@ class OdtToDoc: 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') diff --git a/product/ERP5OOo/transforms/odt_to_pdf.py b/product/ERP5OOo/transforms/odt_to_pdf.py index b1ca491d3be0d47adc54ba82dc93bf6d9ed8b7e3..f9b8e276d8300d5ae44385047116f750d2f260cb 100644 --- a/product/ERP5OOo/transforms/odt_to_pdf.py +++ b/product/ERP5OOo/transforms/odt_to_pdf.py @@ -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 @@ class OdtToPdf: 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') diff --git a/product/ERP5OOo/transforms/odt_to_xml.py b/product/ERP5OOo/transforms/odt_to_xml.py index bd73b4988e94734c299f4267648e8a74641c05bf..d7a154c8c482a331e926eb3cad3965cc1a8d51cf 100644 --- a/product/ERP5OOo/transforms/odt_to_xml.py +++ b/product/ERP5OOo/transforms/odt_to_xml.py @@ -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 @@ class OdtToXml: 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)