dms: py3

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py

@@ -24,7 +24,7 @@ class DocToDocx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     doc = OOOdCommandTransform(context, filename, data, self.inputs[0])
     docx = doc.convertTo('docx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py

@@ -24,7 +24,7 @@ class DocToHtml:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     doc = OOOdCommandTransform(context, filename, data, self.inputs[0])
     html = doc.convertTo('html')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py

@@ -23,7 +23,7 @@ class DocxToDocy:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     docx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     docy = docx.convertTo('docy')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py

@@ -23,7 +23,7 @@ class DocxToOdt:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     docx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     odt = docx.convertTo('odt')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py

@@ -23,7 +23,7 @@ class DocyToDocx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     docy = OOOdCommandTransform(context, filename, data, self.inputs[0])
     docx = docy.convertTo('docx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py

@@ -24,7 +24,7 @@ class OdpToHtml:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odp = OOOdCommandTransform(context, filename, data, self.inputs[0])
     html = odp.convertTo('html')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py

@@ -24,7 +24,7 @@ class OdpToPdf:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odp = OOOdCommandTransform(context, filename, data, self.inputs[0])
     pdf = odp.convertTo('pdf')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py

@@ -24,7 +24,7 @@ class OdpToPptx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odp = OOOdCommandTransform(context, filename, data, self.inputs[0])
     pptx = odp.convertTo('pptx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py

@@ -24,7 +24,7 @@ class OdpToSxi:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odp = OOOdCommandTransform(context, filename, data, self.inputs[0])
     sxi = odp.convertTo('sxi')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py

@@ -24,7 +24,7 @@ class OdsToHtml:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     ods = OOOdCommandTransform(context, filename, data, self.inputs[0])
     html = ods.convertTo('html')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py

@@ -24,7 +24,7 @@ class OdsToPdf:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     ods = OOOdCommandTransform(context, filename, data, self.inputs[0])
     pdf = ods.convertTo('pdf')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py

@@ -23,7 +23,7 @@ class OdsToXlsx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     ods = OOOdCommandTransform(context, filename, data, self.inputs[0])
     xlsx = ods.convertTo('xlsx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py

@@ -24,7 +24,7 @@ class OdtToDocx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odt = OOOdCommandTransform(context, filename, data, self.inputs[0])
     docx = odt.convertTo('docx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py

@@ -24,7 +24,7 @@ class OdtToHtml:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     odt = OOOdCommandTransform(context, filename, data, self.inputs[0])
     html = odt.convertTo('html')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py

@@ -24,7 +24,7 @@ class PdfToBmp:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     pdf = OOOdCommandTransform(context, filename, data, self.inputs[0])
     bmp = pdf.convertTo('bmp')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py

@@ -27,7 +27,7 @@ class PptToPptx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     ppt = OOOdCommandTransform(context, filename, data, self.inputs[0])
     pptx = ppt.convertTo('pptx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py

@@ -24,7 +24,7 @@ class PptxToOdp:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     pptx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     odp = pptx.convertTo('odp')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py

@@ -23,7 +23,7 @@ class PptxToPpty:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     pptx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     ppty = pptx.convertTo('ppty')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py

@@ -23,7 +23,7 @@ class PptyToPptx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     ppty = OOOdCommandTransform(context, filename, data, self.inputs[0])
     pptx = ppty.convertTo('pptx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py

@@ -24,7 +24,7 @@ class SxiToHtml:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     sxi = OOOdCommandTransform(context, filename, data, self.inputs[0])
     html = sxi.convertTo('html')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py

@@ -24,7 +24,7 @@ class SxiToOdp:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     sxi = OOOdCommandTransform(context, filename, data, self.inputs[0])
     odp = sxi.convertTo('odp')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py

@@ -23,7 +23,7 @@ class XlsToOds:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     xls = OOOdCommandTransform(context, filename, data, self.inputs[0])
     ods = xls.convertTo('ods')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py

@@ -23,7 +23,7 @@ class XlsToXlsx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     xls = OOOdCommandTransform(context, filename, data, self.inputs[0])
     xlsx = xls.convertTo('xlsx')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py

@@ -23,7 +23,7 @@ class XlsxToOds:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     xlsx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     ods = xlsx.convertTo('ods')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py

@@ -24,7 +24,7 @@ class XlsxToXlsy:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     xlsx = OOOdCommandTransform(context, filename, data, self.inputs[0])
     xlsy = xlsx.convertTo('xlsy')
     if cache is not None:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py

@@ -23,7 +23,7 @@ class XlsyToXlsx:
     raise AttributeError(attr)
 
   def convert(self, orig, data, cache=None, filename=None, context=None, **kwargs):
-    data = str(orig)
+    data = bytes(orig)
     xlsy = OOOdCommandTransform(context, filename, data, self.inputs[0])
     xlsx = xlsy.convertTo('xlsx')
     if cache is not None:

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getRelatedDocumentList.py

@@ -41,6 +41,6 @@ if relation_id == 'all':
   for obj in (predecessor_value_list + successor_value_list +
               similar_value_list):
     dic[obj] = None
-  return dic.keys()
+  return list(dic.keys())
 
 return [] # failover - undefined relation

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.py

@@ -5,10 +5,7 @@ if brain.getValidationState() == 'embedded':
 else:
   reference = brain.getReference()
 
-return unicode(
-    "javascript:SelectFile('%s?format=%s')" % (
+return "javascript:SelectFile('%s?format=%s')" % (
   reference.replace("'", "\\'"),
   context.getPortalObject().portal_preferences.getPreferredImageFormat()
-    ),
-    'utf-8',
 )
\ No newline at end of file

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testWebCrawler.py

@@ -27,6 +27,7 @@
 #
 ##############################################################################
 
+import six
 import unittest
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import createZODBPythonScript, removeZODBPythonScript
@@ -209,11 +210,15 @@ class TestWebCrawler(ERP5TypeTestCase):
     </html>"""
     web_page.edit(text_content=text_content)
     self.assertEqual(web_page.getContentBaseURL(), "http://www.example.com")
+    expected_encoded_url = 'http://www.example.com/?title=%E9crit'
+    if six.PY2:
+      expected_encoded_url = 'http://www.example.com/?title=\xc3\xa9crit'
     self.assertEqual(web_page.getContentNormalisedURLList(),
                     ["http://www.example.com/I don't care I put what/ I want/",
                      'http://www.example.com/section',
                      'http://www.example.com/section2',
-                     'http://www.example.com/?title=\xc3\xa9crit',])
+                      expected_encoded_url,
+                    ])
     # relative links without base tag
     text_content = """<html>
     <head>