web: py3 WIP

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py

@@ -271,7 +271,7 @@ def handleLinkedData(mime, data, href):
       "mime_type": mime,
       "encode": "quoted-printable" if mime.startswith("text/") else None,
       "add_header_list": [("Content-Location", url)],
-      "data": str(data),
+      "data": bytes(data),
     })
     return url
   else:
@@ -336,7 +336,7 @@ def replaceFromDataUri(data_uri, replacer):
     data = b64decode(data)
   if not is_base64:
     data = replacer(data)
-  return "%s,%s" % (header, b64encode(data) if is_base64 else data)
+  return "%s,%s" % (header, b64encode(data).decode() if is_base64 else data)
 
 def extractUrlSearch(url):
   url = url.split("#", 1)[0].split("?", 1)

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_formatAttachmentListToMIMEMultipartString.py

@@ -80,7 +80,7 @@ def encode_quopri(msg):
   when necessary.
   """
   orig = msg.get_payload()
-  encdata = quopri.encodestring(orig.encode()).replace("=\n", "=\r\n")
+  encdata = quopri.encodestring(orig.encode()).replace(b"=\n", b"=\r\n")
   msg.set_payload(encdata)
   msg.add_header("Content-Transfer-Encoding", "quoted-printable")