Skip to content

Commit

Permalink
Revert "addTokenToUrl soft dependency"
Browse files Browse the repository at this point in the history
  • Loading branch information
thet committed Sep 2, 2015
1 parent 2bd7b26 commit 3bd896b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
4 changes: 1 addition & 3 deletions CHANGES.rst
Expand Up @@ -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)
Expand Down
10 changes: 2 additions & 8 deletions plone/schemaeditor/browser/schema/listing.py
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -36,7 +36,6 @@
'zope.schema',
'zope.publisher',
'z3c.form',
'plone.protect',
'plone.z3cform',
'plone.autoform',
],
Expand Down

0 comments on commit 3bd896b

Please sign in to comment.