feat: drop six usage

plone/rfc822/_utils.py

@@ -15,18 +15,14 @@
 from zope.schema import getFieldsInOrder
 
 import logging
-import six
 
 
 logger = logging.getLogger("plone.rfc822")
 
 
 def safe_native_string(value, encoding="utf8"):
     """Try to convert value into a native string"""
-    if six.PY2:
-        if isinstance(value, str):
-            return value.encode(encoding)
-    elif isinstance(value, bytes):
+    if isinstance(value, bytes):
         return value.decode(encoding)
     if not isinstance(value, str):
         raise ValueError("Cannot convert %r into a native string" % value)

plone/rfc822/fields.rst

@@ -63,7 +63,6 @@ This interface is implemented by a the following class::
     >>> from decimal import Decimal
     >>> from zope.interface import implementer
     >>> import datetime
-    >>> import six
     >>> @implementer(ITestContent)
     ... class TestContent(object):
     ...     _text = u"text\xd8"
@@ -80,7 +79,7 @@ This interface is implemented by a the following class::
     ...     _id = u'some.id'
     ...     _dottedName = 'dotted.name'
     ...     _bool = True
-    ...     _int = long(-10) if six.PY2 else -10
+    ...     _int = -10
     ...     _float = 0.3
     ...     _decimal = Decimal("5.0")
     ...     _choice1 = u"two"
@@ -295,10 +294,7 @@ An URI is in Python 2 based on unicode text, in Python 3 on bytes.
     'http://plone.org'
     >>> marshaler.getContentType() is None
     True
-    >>> if six.PY2:
-    ...     expected = None  # its IBytes based
-    ... else:
-    ...     expected = 'utf-8'
+    >>> expected = 'utf-8'
     >>> marshaler.getCharset('utf-8') == expected
     True
     >>> marshaler.ascii
@@ -316,10 +312,7 @@ Id
     'some.id'
     >>> marshaler.getContentType() is None
     True
-    >>> if six.PY2:
-    ...     expected = None  # its IBytes based
-    ... else:
-    ...     expected = 'utf-8'
+    >>> expected = 'utf-8'
     >>> marshaler.getCharset('utf-8') == expected
     True
     >>> marshaler.ascii
@@ -337,10 +330,7 @@ DottedName
     'dotted.name'
     >>> marshaler.getContentType() is None
     True
-    >>> if six.PY2:
-    ...     expected = None  # its IBytes based
-    ... else:
-    ...     expected = 'utf-8'
+    >>> expected = 'utf-8'
     >>> marshaler.getCharset('utf-8') == expected
     True
     >>> marshaler.ascii

plone/rfc822/message.rst

@@ -23,7 +23,7 @@ annotations, which we will use later in this test::
 
 ::
 
-    >>> from six import StringIO
+    >>> from io import StringIO
     >>> from zope.configuration import xmlconfig
     >>> xmlconfig.xmlconfig(StringIO(configuration))
 
@@ -621,7 +621,6 @@ Technical both is fine.
 
 ::
 
-    >>> import six
     >>> content.description = "Test content\nwith newline difference"
     >>> msg = constructMessageFromSchema(content, ITestContent)
     >>> effective_output = msg.as_string()

plone/rfc822/tests.py

@@ -3,8 +3,6 @@
 from plone.testing.zca import UNIT_TESTING
 
 import doctest
-import re
-import six
 import unittest
 
 
@@ -22,14 +20,6 @@
 )
 
 
-class Py23DocChecker(doctest.OutputChecker):
-    def check_output(self, want, got, optionflags):
-        if six.PY2:
-            got = re.sub("u'(.*?)'", "'\\1'", got)
-        got = re.sub("b'(.*?)'", "'\\1'", got)
-        return doctest.OutputChecker.check_output(self, want, got, optionflags)
-
-
 class TestUtils(unittest.TestCase):
     def test_safe_native_string(self):
         self.assertIsInstance(safe_native_string(b""), str)
@@ -45,7 +35,6 @@ def test_suite():
                 doctest.DocFileSuite(
                     docfile,
                     optionflags=optionflags,
-                    checker=Py23DocChecker(),
                 ),
                 layer=UNIT_TESTING,
             )