Remove checks for six.PY2.

Author: mauritsvanrees

src/collective/easyform/actions.py

@@ -60,7 +60,6 @@
 from zope.schema import Bool
 from zope.schema import getFieldsInOrder
 from zope.security.interfaces import IPermission
-import six
 
 
 logger = getLogger("collective.easyform")
@@ -356,8 +355,6 @@ def get_header_row(self):
         titles = self.getColumnTitles()
         encoded_titles = []
         for t in titles:
-            if six.PY2 and isinstance(t, str):
-                t = t.encode("utf-8")
             encoded_titles.append(t)
         return encoded_titles
 
@@ -409,8 +406,6 @@ def get_attachments(self, fields, request):
             if sendCSV or sendXLSX:
                 if not is_file_data(field):
                     val = self.serialize(field)
-                    if six.PY2:
-                        val = val.encode("utf-8")
                     csvdata += (val,)
 
             if sendXML:
@@ -479,8 +474,6 @@ def get_mail_text(self, fields, request, context):
         """Get header and body of e-mail as text (string)"""
         headerinfo = self.get_header_info(fields, request, context)
         body = self.get_mail_body(fields, request, context)
-        if six.PY2 and isinstance(body, str):
-            body = body.encode("utf-8")
         email_charset = "utf-8"
         # always use text/plain for encrypted bodies
         subtype = (
@@ -521,7 +514,7 @@ def get_mail_text(self, fields, request, context):
             maintype, subtype = ctype.split("/", 1)
 
             if maintype == "text":
-                if not six.PY2 and isinstance(content, bytes):
+                if isinstance(content, bytes):
                     content = content.decode("utf-8")
                 msg = MIMEText(content, _subtype=subtype)
             elif maintype == "image":
@@ -535,8 +528,6 @@ def get_mail_text(self, fields, request, context):
                 encoders.encode_base64(msg)
 
             # Set the filename parameter
-            if six.PY2 and isinstance(filename, str):
-                filename = filename.encode("utf-8")
             msg.add_header(
                 "Content-Disposition", "attachment", filename=("utf-8", "", filename)
             )
@@ -585,8 +576,6 @@ def getScript(self, context):
         if role != "none":
             script.manage_proxy((role,))
 
-        if six.PY2 and isinstance(body, str):
-            body = body.encode("utf-8")
         params = "fields, easyform, request"
         script.ZPythonScript_edit(params, body)
         return script
@@ -688,8 +677,6 @@ def get_header_row(self):
         titles = self.getColumnTitles()
         encoded_titles = []
         for t in titles:
-            if six.PY2 and isinstance(t, str):
-                t = t.encode("utf-8")
             encoded_titles.append(t)
         return encoded_titles
 
@@ -702,12 +689,8 @@ def get_data(row, i):
                 return data.raw
             if is_file_data(data):
                 data = data.filename
-            if six.PY2 and isinstance(data, str):
-                return data.encode("utf-8")
             if isinstance(data, (list, tuple, set)):
                 data = '|'.join(data)
-                if six.PY2:
-                    return data.encode('utf-8')
             return data
 
         return [get_data(row, i) for i in names]

src/collective/easyform/api.py

@@ -16,8 +16,6 @@
 from re import compile
 from zope.schema import getFieldsInOrder
 
-import six
-
 
 CONTEXT_KEY = "context"
 # regular expression for dollar-sign variable replacement.
@@ -94,9 +92,6 @@ def get_expression(context, expression_string, **kwargs):
     :param dict kwargs: additional arguments for expression
     :returns: result of TALES expression
     """
-    if six.PY2 and isinstance(expression_string, str):
-        expression_string = expression_string.encode("utf-8")
-
     expression_context = getExprContext(context, context)
     for key in kwargs:
         expression_context.setGlobal(key, kwargs[key])
@@ -249,9 +244,6 @@ def cleanup(value):
     if isinstance(value, (list, tuple)):
         value = [safe_text(s).strip() for s in value]
 
-    if six.PY2:
-        # py2 expects a list of bytes
-        value = [s.encode("utf-8") for s in value if s]
     return value
 
 

src/collective/easyform/browser/view.py

@@ -38,8 +38,6 @@
 from zope.schema import ValidationError
 from ZPublisher.mapply import mapply
 
-import six
-
 
 logger = getLogger("collective.easyform")
 PMF = MessageFactory("plone")
@@ -198,8 +196,6 @@ def handleSubmit(self, action):
             return
         thanksPageOverrideAction = self.context.thanksPageOverrideAction
         thanksPage = get_expression(self.context, thanksPageOverride)
-        if six.PY2 and isinstance(thanksPage, str):
-            thanksPage = thanksPage.encode("utf-8")
         if thanksPageOverrideAction == "redirect_to":
             self.request.response.redirect(thanksPage)
             return
@@ -366,8 +362,6 @@ def header_injection(self):
         if not tal_expression:
             return ""
         header_to_inject = get_expression(self.context, tal_expression)
-        if six.PY2 and isinstance(header_to_inject, str):
-            header_to_inject = header_to_inject.encode("utf-8")
 
         return header_to_inject
 

src/collective/easyform/interfaces/fields.py

@@ -19,7 +19,6 @@
 from zope.schema.interfaces import IContextSourceBinder
 from zope.schema.vocabulary import SimpleVocabulary
 
-import six
 import z3c.form.interfaces
 import zope.interface
 import zope.schema.interfaces

src/collective/easyform/migration/fields.py

@@ -6,7 +6,6 @@
 from Products.PloneFormGen.interfaces import IPloneFormGenFieldset
 
 import logging
-import six
 
 
 logger = logging.getLogger("collective.easyform.migration")
@@ -149,8 +148,6 @@ def to_text(value):
     if isinstance(value, (list, tuple)):
         return [to_text(v) for v in value]
     value = str(value)
-    if six.PY2:
-        value = value.decode("utf8")
     return value
 
 

src/collective/easyform/tests/attachment.rst

@@ -2,7 +2,7 @@ File attachments
 ================
 
 ::
-    >>> from six import BytesIO
+    >>> from io import BytesIO
     >>> browser = get_browser(layer)
 
 Add a new EasyForm::

src/collective/easyform/tests/testCustomScript.py

@@ -13,8 +13,6 @@
 from plone.app.testing import logout
 from Products.CMFCore import permissions
 
-import six
-
 
 test_script = """
 ## Python Script

src/collective/easyform/tests/testLikert.py

@@ -1,5 +1,4 @@
 import unittest
-import six
 
 from collective.easyform.tests.base import EasyFormFunctionalTestCase
 from zope.schema.interfaces import RequiredMissing

src/collective/easyform/validators.py

@@ -11,9 +11,6 @@
 from z3c.form import validator
 
 
-import six
-
-
 BAD_SIGNS = frozenset(["<a ", "www.", "http:", ".com", "https:"])
 
 
@@ -71,8 +68,6 @@ def validate(value, **kwargs):
                 if value is None:
                     # Let the system for required take care of None values
                     return
-                if six.PY2 and isinstance(value, str):
-                    value = value.encode("utf-8")
                 res = validation(name, value, **kwargs)
                 if res != 1:
                     return res