Commit b55bf817 authored by Hanno Schlichting's avatar Hanno Schlichting

Use proper deprecation for the permission classes

parent d0437895
...@@ -66,11 +66,12 @@ webdav_access='WebDAV access' ...@@ -66,11 +66,12 @@ webdav_access='WebDAV access'
webdav_lock_items='WebDAV Lock items' webdav_lock_items='WebDAV Lock items'
webdav_unlock_items='WebDAV Unlock items' webdav_unlock_items='WebDAV Unlock items'
# BBB - conditional dependency
try: from zope.deferredimport import deprecated
from DocumentTemplate import permissions
except ImportError: new_loc = 'DocumentTemplate.permissions'
pass
else: deprecated("Please import from %s" % new_loc,
change_dtml_documents = permissions.change_dtml_documents change_dtml_documents = '%s:change_dtml_documents' % new_loc,
change_dtml_methods = permissions.change_dtml_methods change_dtml_methods = '%s:change_dtml_methods' % new_loc,
)
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
from urllib import quote from urllib import quote
from AccessControl import getSecurityManager from AccessControl import getSecurityManager
from AccessControl.Permissions import change_dtml_methods
from AccessControl.Permissions import change_dtml_documents
from App.class_init import InitializeClass from App.class_init import InitializeClass
from App.special_dtml import DTMLFile from App.special_dtml import DTMLFile
from App.special_dtml import HTML from App.special_dtml import HTML
from DocumentTemplate.permissions import change_dtml_methods
from DocumentTemplate.permissions import change_dtml_documents
from OFS.DTMLMethod import decapitate from OFS.DTMLMethod import decapitate
from OFS.DTMLMethod import DTMLMethod from OFS.DTMLMethod import DTMLMethod
from OFS.PropertyManager import PropertyManager from OFS.PropertyManager import PropertyManager
......
...@@ -29,7 +29,7 @@ from AccessControl import getSecurityManager ...@@ -29,7 +29,7 @@ from AccessControl import getSecurityManager
from AccessControl.Permissions import view from AccessControl.Permissions import view
from AccessControl.Permissions import manage_properties from AccessControl.Permissions import manage_properties
from AccessControl.Permissions import add_documents_images_and_files from AccessControl.Permissions import add_documents_images_and_files
from AccessControl.Permissions import change_dtml_documents from DocumentTemplate.permissions import change_dtml_documents
from StringIO import StringIO from StringIO import StringIO
from urllib import urlencode from urllib import urlencode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment