Removed Py23DocChecker.

This was only needed to make the doctest output compatible between Python 2 and 3.

Author: mauritsvanrees

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 4.5.1 (unreleased)
 ------------------
 
+- Remove usage of the ``six`` compatibility library.  [maurits]
 - Update deprecated imports for Plone 6.0 and higher.  [maurits]
 
 

setup.py

@@ -53,7 +53,6 @@
         "Products.CMFPlone>=6.0.0b1",
         "Products.validation>=3.0.0",
         "setuptools",
-        "six",
         # -*- Extra requirements: -*-
     ],
     extras_require={

src/collective/easyform/tests/testDocTests.py

@@ -6,8 +6,6 @@
 
 import doctest
 import os
-import re
-import six
 import unittest
 
 
@@ -31,14 +29,6 @@
 )
 
 
-class Py23DocChecker(doctest.OutputChecker):
-    def check_output(self, want, got, optionflags):
-        if six.PY2:
-            got = re.sub("zExceptions.NotFound", "NotFound", got)
-            got = re.sub("u'(.*?)'", "'\\1'", want)
-        return doctest.OutputChecker.check_output(self, want, got, optionflags)
-
-
 def get_browser(layer, auth=True):
     browser = Browser(layer["app"])
     browser.handleErrors = False
@@ -68,7 +58,6 @@ def test_suite():
                         "get_browser": get_browser,
                         "get_image_path": get_image_path,
                     },
-                    checker=Py23DocChecker(),
                 ),
                 layer=FUNCTIONAL_TESTING,
             )