Remove Plone < 5.2 and Python < 3 code. (#1171)

* WIP: Remove Plone < 5.2 and Python < 3 code.

* Apply black.

* Update changelog.

Author: ericof

Makefile

@@ -24,8 +24,6 @@ help: ## This help message
 update: ## Update Make and Buildout
 	wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/master/Makefile
 	wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/master/requirements.txt
-	wget -O plone-4.3.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-4.3.x.cfg
-	wget -O plone-5.1.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.1.x.cfg
 	wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.2.x.cfg
 	wget -O ci.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/ci.cfg
 	wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/versions.cfg
@@ -42,35 +40,6 @@ bin/buildout: bin/pip
 bin/python bin/pip:
 	python$(version) -m venv . || virtualenv --python=python$(version) .
 
-py2:
-	virtualenv --python=python2 .
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-
-.PHONY: Build Plone 4.3
-build-plone-4.3: py2 ## Build Plone 4.3
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-4.3.x.cfg
-
-.PHONY: Build Plone 5.0
-build-plone-5.0: py2 ## Build Plone 5.0
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.0.x.cfg
-
-.PHONY: Build Plone 5.1
-build-plone-5.1: py2  ## Build Plone 5.1
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.1.x.cfg
-
-.PHONY: Build Plone 5.2 with Python 2
-build-plone-5.2-py: py2  ## Build Plone 5.2 with Python 2
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.2.x.cfg
-
 .PHONY: Build Plone 5.2
 build-plone-5.2: .installed.cfg  ## Build Plone 5.2
 	bin/pip install --upgrade pip

news/1140.feature

@@ -0,0 +1,2 @@
+Remove Python 2, Plone 4.3, and 5.1 code.
+[ericof]

src/plone/restapi/batching.py

@@ -1,7 +1,7 @@
 from plone.batching.batch import Batch
 from plone.restapi.deserializer import json_body
-from six.moves.urllib.parse import parse_qsl
-from six.moves.urllib.parse import urlencode
+from urllib.parse import parse_qsl
+from urllib.parse import urlencode
 
 
 DEFAULT_BATCH_SIZE = 25

src/plone/restapi/controlpanels/types.py

@@ -13,17 +13,14 @@
 import plone.protect.interfaces
 from zope.interface import noLongerProvides
 from plone.restapi.interfaces import IPloneRestapiLayer
-from Products.CMFPlone.utils import getFSVersionTuple
-
-PLONE5 = getFSVersionTuple()[0] >= 5
 
 
 @adapter(Interface, IPloneRestapiLayer)
 @implementer(IDexterityTypesControlpanel)
 class DexterityTypesControlpanel(RegistryConfigletPanel):
     schema = Interface
     configlet_id = "dexterity-types"
-    configlet_category_id = "plone-content" if PLONE5 else "Plone"
+    configlet_category_id = "plone-content"
 
     def add(self, names):
         data = json_body(self.request)

src/plone/restapi/demo/demo.py

@@ -3,7 +3,7 @@
 
 class InternalServerErrorView(BrowserView):  # pragma: no cover
     def __call__(self):
-        from six.moves.urllib.error import HTTPError
+        from urllib.error import HTTPError
 
         raise HTTPError(
             "http://nohost/plone/internal_server_error",

src/plone/restapi/deserializer/dxfields.py

@@ -27,7 +27,6 @@
 
 import codecs
 import dateutil
-import six
 
 import html as html_parser
 
@@ -264,8 +263,6 @@ def __call__(self, value):
 
         # Convert if we have data
         if data:
-            if six.PY2:
-                content_type = content_type.encode("utf8")
             value = self.field._type(
                 data=data, contentType=content_type, filename=filename
             )

src/plone/restapi/deserializer/mixins.py

@@ -3,8 +3,6 @@
 from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
 from zExceptions import BadRequest
 
-import six
-
 
 class OrderingMixin:
     def handle_ordering(self, data):
@@ -41,16 +39,6 @@ def reorderItems(self, obj_id, delta, subset_ids):
             if subset_ids != [i for position, i in position_id]:
                 raise BadRequest("Client/server ordering mismatch")
 
-        # Make sure we use bytestring ids for PY2.
-        if six.PY2:
-            if isinstance(obj_id, str):
-                obj_id = obj_id.encode("utf-8")
-            if subset_ids:
-                subset_ids = [
-                    id_.encode("utf-8") if isinstance(id_, str) else id_
-                    for id_ in subset_ids
-                ]
-
         # All movement is relative to the subset of ids, if passed in.
         if delta == "top":
             ordering.moveObjectsToTop([obj_id], subset_ids=subset_ids)

src/plone/restapi/deserializer/relationfield.py

@@ -10,8 +10,6 @@
 from zope.intid.interfaces import IIntIds
 from zope.publisher.interfaces.browser import IBrowserRequest
 
-import six
-
 
 @implementer(IFieldDeserializer)
 @adapter(IRelationChoice, IDexterityContent, IBrowserRequest)
@@ -30,8 +28,6 @@ def __call__(self, value):
             obj = intids.queryObject(value)
             resolved_by = "intid"
         elif isinstance(value, str):
-            if six.PY2 and isinstance(value, str):
-                value = value.encode("utf8")
             portal = getMultiAdapter(
                 (self.context, self.request), name="plone_portal_state"
             ).portal()

src/plone/restapi/pas/plugin.py

@@ -18,7 +18,6 @@
 from zope.interface import implementer
 
 import jwt
-import six
 import time
 
 
@@ -119,8 +118,6 @@ def authenticateCredentials(self, credentials):
             return
 
         userid = payload["sub"]
-        if six.PY2:
-            userid = userid.encode("utf8")
 
         if self.store_tokens:
             if userid not in self._tokens:

src/plone/restapi/search/handler.py

@@ -3,19 +3,11 @@
 from plone.restapi.interfaces import IZCatalogCompatibleQuery
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.browser.navtree import getNavigationRoot
+from Products.CMFPlone.interfaces import ISearchSchema
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 
 
-try:
-    from Products.CMFPlone.factory import _IMREALLYPLONE5  # noqa
-    from Products.CMFPlone.interfaces import ISearchSchema
-except ImportError:
-    PLONE5 = False
-else:
-    PLONE5 = True
-
-
 class SearchHandler:
     """Executes a catalog search based on a query dict, and returns
     JSON compatible results.
@@ -91,7 +83,7 @@ def search(self, query=None):
             use_site_search_settings = True
             del query["use_site_search_settings"]
 
-        if PLONE5 and use_site_search_settings:
+        if use_site_search_settings:
             query = self.filter_query(query)
 
         self._constrain_query_by_path(query)