From 3bd896bba44c80faf76829ad30b872c09e3923ed Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Wed, 2 Sep 2015 17:51:08 +0200
Subject: [PATCH] Revert "addTokenToUrl soft dependency"

---
 CHANGES.rst                                  |  4 +---
 plone/schemaeditor/browser/schema/listing.py | 10 ++--------
 setup.py                                     |  1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 77345fa..40baee7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,9 +4,7 @@ Changelog
 2.0.7 (unreleased)
 ------------------
 
-- Make ``plone.protect.utils.addTokenToUrl`` a soft dependency, making this
-  package usable in Plone < 5.0.
-  [thet]
+- Nothing changed yet.
 
 
 2.0.6 (2015-07-18)
diff --git a/plone/schemaeditor/browser/schema/listing.py b/plone/schemaeditor/browser/schema/listing.py
index a559c7e..0c35d01 100644
--- a/plone/schemaeditor/browser/schema/listing.py
+++ b/plone/schemaeditor/browser/schema/listing.py
@@ -7,18 +7,13 @@
 from plone.z3cform.layout import FormWrapper
 from plone.memoize.instance import memoize
 from plone.autoform.form import AutoExtensibleForm
+from plone.protect.utils import addTokenToUrl
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 from plone.schemaeditor import SchemaEditorMessageFactory as _
 from plone.schemaeditor.interfaces import IFieldFactory
 from plone.schemaeditor.utils import SchemaModifiedEvent
 
-try:
-    from plone.protect.utils import addTokenToUrl
-except ImportError:
-    addTokenToUrl = None
-
-
 
 class SchemaListing(AutoExtensibleForm, form.Form):
     implements(IEditForm)
@@ -88,8 +83,7 @@ def delete_url(self, field):
         if field.__name__ in self.context.fieldsWhichCannotBeDeleted:
             return
         url = '%s/%s/@@delete' % (self.context.absolute_url(), field.__name__)
-        if addTokenToUrl:
-            url = addTokenToUrl(url, self.request)
+        url = addTokenToUrl(url, self.request)
         return url
 
     @button.buttonAndHandler(
diff --git a/setup.py b/setup.py
index b509a00..dbefdaa 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,6 @@
           'zope.schema',
           'zope.publisher',
           'z3c.form',
-          'plone.protect',
           'plone.z3cform',
           'plone.autoform',
       ],