DMS py3

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Base.py

@@ -2117,8 +2117,7 @@ class TestImage(ERP5TypeTestCase):
     image_type, image_data = image.convert('jpg', display='thumbnail')
     self.assertEqual('image/jpeg', image_type)
     # magic
-    self.assertEqual('\xff', image_data[0])
-    self.assertEqual('\xd8', image_data[1])
+    self.assertEqual(image_data[0:2], b'\xff\xd8')
 
   def test_ImageSize(self):
     for filename, size in (

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

@@ -234,10 +234,8 @@ class TestDocument(TestDocumentMixin):
     infile = urlopen(url)
     # save as file with proper incl. format filename (for some reasons PIL uses this info)
     filename = "%s%stest-image-format-resize.%s" %(os.getcwd(), os.sep, format_)
-    f = open(filename, "w")
-    image_data = infile.read()
-    f.write(image_data)
-    f.close()
+    with open(filename, "wb") as f:
+      f.write(infile.read())
     infile.close()
     file_size = len(image_data)
     try:
@@ -246,6 +244,7 @@ class TestDocument(TestDocumentMixin):
       image_size = image.size
     except ImportError:
       identify_output = Popen(['identify', filename],
+                              universal_newlines=True,
                               stdout=PIPE).communicate()[0]
       image_size = tuple([int(x) for x in identify_output.split()[2].split('x')])
     os.remove(filename)
@@ -3180,7 +3179,7 @@ class DocumentConsistencyTestCase(ERP5TypeTestCase):
   def afterSetUp(self):
     self.document = self._getDocumentModule().newContent(portal_type=self.portal_type)
     self.file_upload = makeFileUpload(self.filename)
-    with open(makeFilePath(self.filename)) as f:
+    with open(makeFilePath(self.filename), 'rb') as f:
       self.file_data = f.read()
     self.file_size = len(self.file_data)
 

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.TextDocument.py

@@ -315,7 +315,7 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
       return text_content, message
 
     content_type = self.getContentType() or DEFAULT_CONTENT_TYPE
-    text_content = self.getData()
+    text_content = self.getData() # TODO: don't we need to convert to bytes here ? what if it is PData ?
     if content_type.endswith('xml'):
       try:
         tree = etree.fromstring(text_content)
@@ -324,7 +324,10 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
       except etree.XMLSyntaxError: # pylint: disable=catching-non-exception
         message = 'Conversion to base format without codec fails'
     elif content_type == 'text/html':
-      re_match = self.charset_parser.search(text_content)
+      re_match = self.charset_parser.search(
+        # we don't really care about decoding errors for searching this
+        # regexp
+        text_content.decode('ascii', 'replace') if six.PY3 else text_content)
       message = 'Conversion to base format succeeds'
       if re_match is not None:
         charset = re_match.group('charset')
@@ -374,6 +377,12 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
     """Overriden method to check
     permission to access content in raw format
     """
+    # XXX Zope4py3: should this return str ??
+    # We probably have "legacy" documents where `text_content` is a python2
+    # str encoded as something else than utf-8.
+    # Maybe we should introduce a new text_content_encoding property and
+    # expose API to getRawTextContent (as bytes) and getTextContent would return
+    # the decoded string.
     self._checkConversionFormatPermission(None)
     if default is _MARKER:
       return self._baseGetTextContent()
@@ -406,6 +415,7 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
     return self._setContentType(value)
 
   def getData(self, default=_MARKER):
+    # type: () -> bytes | PData
     """getData must returns original content but TextDocument accepts
     data or text_content to store original content.
     Fallback on text_content property if data is not defined