Remove unneeded backwards compatibility code for old Zope and Plone versions.

Author: mauritsvanrees

news/+d90ae288.bugfix.rst

@@ -0,0 +1 @@
+Remove unneeded backwards compatibility code for old Zope and Plone versions.  [maurits]

src/plone/app/drafts/browser/view.py

@@ -1,11 +1,6 @@
 from datetime import datetime
 from plone.app.uuid.utils import uuidToObject
-
-
-try:
-    from urllib import quote
-except ImportError:
-    from urllib.parse import quote
+from urllib.parse import quote
 
 
 class View:

src/plone/app/drafts/dexterity.py

@@ -13,6 +13,7 @@
 from plone.dexterity.interfaces import IDexterityContent
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.dexterity.utils import createContent
+from plone.protect.interfaces import IDisableCSRFProtection
 from plone.uuid.interfaces import IMutableUUID
 from plone.uuid.interfaces import IUUID
 from z3c.form.field import FieldWidgets as FieldWidgetsBase
@@ -33,14 +34,6 @@
 import transaction
 
 
-try:
-    from plone.protect.interfaces import IDisableCSRFProtection
-
-    HAS_PLONE_PROTECT = True
-except ImportError:
-    HAS_PLONE_PROTECT = False
-
-
 AUTOSAVE_BLACKLIST = [
     "IShortName.id",
 ]
@@ -233,9 +226,8 @@ def autosave(event):  # noqa
         for key, value in values.items():
             setattr(draft, key, value)
 
-        # Disable Plone 5 implicit CSRF to update draft
-        if HAS_PLONE_PROTECT:
-            alsoProvides(request, IDisableCSRFProtection)
+        # Disable implicit CSRF to update draft
+        alsoProvides(request, IDisableCSRFProtection)
 
 
 @adapter(IDexterityContent, IObjectAddedEvent)

src/plone/app/drafts/tests.py

@@ -1,4 +1,3 @@
-from pkg_resources import parse_version
 from plone.app.drafts.draft import Draft
 from plone.app.drafts.interfaces import DRAFT_NAME_KEY
 from plone.app.drafts.interfaces import ICurrentDraftManagement
@@ -30,7 +29,6 @@
 from zope.component import queryUtility
 from zope.interface import implementer
 
-import pkg_resources
 import transaction
 import unittest
 
@@ -553,19 +551,8 @@ def test_discard(self):
         current = ICurrentDraftManagement(request)
         current.discard()
 
-        expires = "Wed, 31-Dec-97 23:59:59 GMT"
-
-        try:
-            # expires date changed in ZPublisher.HTTPResponse
-            # see https://github.com/zopefoundation/Zope/commit/77f483a22d6b0cb00883006cf38928cda77b75f9
-            zope_version = pkg_resources.get_distribution("Zope").version
-            if parse_version(zope_version) >= parse_version("4.0b8"):
-                expires = "Wed, 31 Dec 1997 23:59:59 GMT"
-        except Exception:
-            pass
-
         deletedToken = {
-            "Expires": expires,
+            "Expires": "Wed, 31 Dec 1997 23:59:59 GMT",
             "Max-Age": "0",
             "Path": "/",
             "value": "deleted",