Commit 398a8c5f authored by Arnaud Fontaine's avatar Arnaud Fontaine

WIP-encode-decode: fixup! py2/py3: Make Products code compatible with both python2 and python3.

parent ade0b148
...@@ -4,6 +4,7 @@ import six ...@@ -4,6 +4,7 @@ import six
from io import BytesIO from io import BytesIO
import zipfile import zipfile
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
from Products.ERP5Type.Utils import ensure_ascii
portal = context.getPortalObject() portal = context.getPortalObject()
active_process = portal.restrictedTraverse(active_process) active_process = portal.restrictedTraverse(active_process)
...@@ -19,11 +20,9 @@ if test_compta_demat_compatibility: ...@@ -19,11 +20,9 @@ if test_compta_demat_compatibility:
# some "important" characters such as € # some "important" characters such as €
# https://github.com/DGFiP/Test-Compta-Demat/issues/37 # https://github.com/DGFiP/Test-Compta-Demat/issues/37
# https://github.com/DGFiP/Test-Compta-Demat/issues/39 # https://github.com/DGFiP/Test-Compta-Demat/issues/39
fec_file = unicodedata.normalize( fec_file = ensure_ascii(unicodedata.normalize(
'NFKD', fec_file.replace(u"€", "EUR") 'NFKD', fec_file.replace(u"€", "EUR")
).encode( ), 'ignore')
'ascii', 'ignore'
).decode('ascii')
zipbuffer = BytesIO() zipbuffer = BytesIO()
zipfilename = at_date.strftime('FEC-%Y%m%d.zip') zipfilename = at_date.strftime('FEC-%Y%m%d.zip')
......
...@@ -721,7 +721,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -721,7 +721,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
self.assertEqual("""Path,Id,Title,Short Title,Reference,Codification,Int Index,Description self.assertEqual("""Path,Id,Title,Short Title,Reference,Codification,Int Index,Description
*,bar,Bar,SBar,,,3,desc *,bar,Bar,SBar,,,3,desc
*,foo,Foo,,Rfoo,CFoo,, *,foo,Foo,,Rfoo,CFoo,,
""", csv_data.decode()) """, bytes2str(csv_data))
def test_ERP5Site_reindexLatestIndexedObjects(self): def test_ERP5Site_reindexLatestIndexedObjects(self):
module = self.portal.newContent(portal_type='Folder', id='test_folder') module = self.portal.newContent(portal_type='Folder', id='test_folder')
......
...@@ -82,7 +82,7 @@ def decode_email(file_): ...@@ -82,7 +82,7 @@ def decode_email(file_):
payload = part.get_payload(decode=True) payload = part.get_payload(decode=True)
#LOG('CMFMailIn -> ',0,'charset: %s, payload: %s' % (charset,payload)) #LOG('CMFMailIn -> ',0,'charset: %s, payload: %s' % (charset,payload))
if charset: if charset:
payload = payload.decode(charset) payload = six.text_type(payload, charset)
if six.PY2: if six.PY2:
payload = unicode2str(payload) payload = unicode2str(payload)
if body_found: if body_found:
......
...@@ -189,17 +189,17 @@ if book_include_reference_table: ...@@ -189,17 +189,17 @@ if book_include_reference_table:
book_table_list=book_table_list book_table_list=book_table_list
) )
#if book_format == 'html' or book_format == 'mhtml': #if book_format == 'html' or book_format == 'mhtml':
# book_references = book_references.encode('UTF-8').strip() # book_references = unicode2str(book_references).strip()
# backcompat for manual history tables at the beginning of documents # backcompat for manual history tables at the beginning of documents
# NOTE: assumes <section>s are not used elsewhere! # NOTE: assumes <section>s are not used elsewhere!
#if len(book_history_section_list) > 0: #if len(book_history_section_list) > 0:
# book_content = book_content.replace(book_history_section_list[-1], (book_history_section_list[-1] + book_references.encode('UTF-8').strip())) # book_content = book_content.replace(book_history_section_list[-1], (book_history_section_list[-1] + unicode2str(book_references).strip()))
#else: #else:
# book_content = book_content.replace("${WebPage_insertTableOfReferences}", book_references.encode('UTF-8').strip()) # book_content = book_content.replace("${WebPage_insertTableOfReferences}", unicode2str(book_references).strip())
book_references = book.Base_unescape(book_references) book_references = book.Base_unescape(book_references)
if six.PY2: if six.PY2:
book_references = book_references.encode('utf-8') book_references = unicode2str(book_references)
book_content = book_content.replace("${WebPage_insertTableOfReferences}", book_references.strip()) book_content = book_content.replace("${WebPage_insertTableOfReferences}", book_references.strip())
else: else:
book_content = book_content.replace("${WebPage_insertTableOfReferences}", blank) book_content = book_content.replace("${WebPage_insertTableOfReferences}", blank)
...@@ -371,7 +371,7 @@ elif book_format == "pdf": ...@@ -371,7 +371,7 @@ elif book_format == "pdf":
) )
#if book_include_reference_table: #if book_include_reference_table:
# after_toc_data_list.append( # after_toc_data_list.append(
# b64encode(str2bytes(book.Base_convertHtmlToSingleFile(book_references, allow_script=True))).decode() # bytes2str(b64encode(str2bytes(book.Base_convertHtmlToSingleFile(book_references, allow_script=True))))
# ) # )
xsl_style_sheet_data = str2bytes(book_table_of_content) xsl_style_sheet_data = str2bytes(book_table_of_content)
embedded_html_data = str2bytes(book.Base_convertHtmlToSingleFile(book_content, allow_script=True)) embedded_html_data = str2bytes(book.Base_convertHtmlToSingleFile(book_content, allow_script=True))
......
...@@ -207,7 +207,7 @@ class TestERP5Credential(ERP5TypeTestCase): ...@@ -207,7 +207,7 @@ class TestERP5Credential(ERP5TypeTestCase):
payload = part.get_payload(decode=True) payload = part.get_payload(decode=True)
#LOG('CMFMailIn -> ',0,'charset: %s, payload: %s' % (charset,payload)) #LOG('CMFMailIn -> ',0,'charset: %s, payload: %s' % (charset,payload))
if charset: if charset:
payload = payload.decode(charset) payload = six.text_type(payload, charset)
if six.PY2: if six.PY2:
payload = unicode2str(payload) payload = unicode2str(payload)
if body_found: if body_found:
......
...@@ -43,7 +43,7 @@ from Products.ERP5Type.tests.Sequence import SequenceList ...@@ -43,7 +43,7 @@ from Products.ERP5Type.tests.Sequence import SequenceList
from erp5.component.test.testPackingList import TestPackingListMixin from erp5.component.test.testPackingList import TestPackingListMixin
from Products.ERP5.tests.utils import newSimulationExpectedFailure from Products.ERP5.tests.utils import newSimulationExpectedFailure
from erp5.component.module.TestInvoiceMixin import TestInvoiceMixin, TestSaleInvoiceMixin from erp5.component.module.TestInvoiceMixin import TestInvoiceMixin, TestSaleInvoiceMixin
from Products.ERP5Type.Utils import bytes2str from Products.ERP5Type.Utils import ensure_ascii
class TestInvoice(TestInvoiceMixin): class TestInvoice(TestInvoiceMixin):
"""Test methods for sale and purchase invoice. """Test methods for sale and purchase invoice.
...@@ -567,7 +567,7 @@ class TestInvoice(TestInvoiceMixin): ...@@ -567,7 +567,7 @@ class TestInvoice(TestInvoiceMixin):
output = BytesIO() output = BytesIO()
output.write(odt) output.write(odt)
m = OpenDocumentTextFile(output) m = OpenDocumentTextFile(output)
text_content=bytes2str(m.toString().encode('ascii','replace')) text_content=ensure_ascii(m.toString(), 'replace')
if text_content.find('Resource Tax') != -1 : if text_content.find('Resource Tax') != -1 :
self.fail('fail to delete the tax line in product line') self.fail('fail to delete the tax line in product line')
if text_content.find('Tax Code') == -1 : if text_content.find('Tax Code') == -1 :
......
...@@ -31,7 +31,7 @@ from six.moves.urllib.parse import quote ...@@ -31,7 +31,7 @@ from six.moves.urllib.parse import quote
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from Products.ERP5Type.Globals import InitializeClass from Products.ERP5Type.Globals import InitializeClass
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from Products.ERP5Type.Utils import fill_args_from_request, str2bytes, str2unicode, unicode2str from Products.ERP5Type.Utils import fill_args_from_request, str2bytes, bytes2str, str2unicode, unicode2str
from Products.CMFCore.utils import getToolByName, _checkConditionalGET, _setCacheHeaders,\ from Products.CMFCore.utils import getToolByName, _checkConditionalGET, _setCacheHeaders,\
_ViewEmulator _ViewEmulator
import warnings import warnings
...@@ -57,7 +57,7 @@ except ImportError: ...@@ -57,7 +57,7 @@ except ImportError:
if six.PY2: if six.PY2:
quoted_file_name = quote(unicode2str(file_name)) quoted_file_name = quote(unicode2str(file_name))
else: else:
encoded_file_name = encoded_file_name.decode('us-ascii') encoded_file_name = bytes2str(encoded_file_name, 'us-ascii')
quoted_file_name = quote(file_name) quoted_file_name = quote(file_name)
return '{disposition}; '\ return '{disposition}; '\
......
...@@ -38,7 +38,7 @@ from Products.Formulator.Field import ZMIField ...@@ -38,7 +38,7 @@ from Products.Formulator.Field import ZMIField
from Products.Formulator.Errors import FormValidationError, ValidationError from Products.Formulator.Errors import FormValidationError, ValidationError
from .Selection import Selection, DomainSelection from .Selection import Selection, DomainSelection
from .Tool.SelectionTool import createFolderMixInPageSelectionMethod from .Tool.SelectionTool import createFolderMixInPageSelectionMethod
from Products.ERP5Type.Utils import UpperCase, ensure_list, getPath, str2bytes, bytes2str from Products.ERP5Type.Utils import UpperCase, ensure_list, getPath, str2bytes, bytes2str, unicode2str
from Products.ERP5Type.Document import newTempBase from Products.ERP5Type.Document import newTempBase
from Products.CMFCore.utils import getToolByName from Products.CMFCore.utils import getToolByName
from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain
...@@ -2716,10 +2716,7 @@ class ListBoxListRenderer(ListBoxRenderer): ...@@ -2716,10 +2716,7 @@ class ListBoxListRenderer(ListBoxRenderer):
title_listboxline = ListBoxLine() title_listboxline = ListBoxLine()
title_listboxline.markTitleLine() title_listboxline.markTitleLine()
for c in self.getSelectedColumnList(): for c in self.getSelectedColumnList():
if six.PY2: title_listboxline.addColumn(c[0], unicode2str(c[1], self.getEncoding()))
title_listboxline.addColumn(c[0], c[1].encode(self.getEncoding()))
else:
title_listboxline.addColumn(c[0], c[1])
listboxline_list.append(title_listboxline) listboxline_list.append(title_listboxline)
# Obtain the list of lines. # Obtain the list of lines.
......
...@@ -48,7 +48,7 @@ from io import BytesIO ...@@ -48,7 +48,7 @@ from io import BytesIO
import re import re
import itertools import itertools
import six import six
from Products.ERP5Type.Utils import bytes2str, str2bytes from Products.ERP5Type.Utils import bytes2str, str2bytes, unicode2str
try: try:
from zExceptions import ResourceLockedError from zExceptions import ResourceLockedError
...@@ -103,7 +103,7 @@ class OOoTemplateStringIO(FasterStringIO): ...@@ -103,7 +103,7 @@ class OOoTemplateStringIO(FasterStringIO):
def write(self, s): def write(self, s):
return FasterStringIO.write( return FasterStringIO.write(
self, self,
str2bytes(convert_to_xml_compatible_string(s))) str2bytes(unicode2str(convert_to_xml_compatible_string(s))))
from Products.PageTemplates.Expressions import ZopeContext, createZopeEngine from Products.PageTemplates.Expressions import ZopeContext, createZopeEngine
...@@ -346,10 +346,7 @@ class OOoTemplate(ZopePageTemplate): ...@@ -346,10 +346,7 @@ class OOoTemplate(ZopePageTemplate):
('style', 'draw:style-name', 'fr1')): ('style', 'draw:style-name', 'fr1')):
options_dict.setdefault(name, options_dict.pop(old_name, default)) options_dict.setdefault(name, options_dict.pop(old_name, default))
if six.PY2: picture = unicode2str(self._resolvePath(options_dict.pop('path')))
picture = self._resolvePath(options_dict.pop('path').encode())
else:
picture = self._resolvePath(options_dict.pop('path'))
# If this is not a File, build a new file with this content # If this is not a File, build a new file with this content
if not isinstance(picture, File): if not isinstance(picture, File):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment