[Zope-Checkins] SVN: Zope/branches/hannosch-dtml-vs-accesscontrol/src/ Use proper deprecation for the permission classes

[Hanno Schlichting]

Log message for revision 112386:
  Use proper deprecation for the permission classes
  

Changed:
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/AccessControl/Permissions.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLDocument.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/Testing/ZopeTestCase/testFunctional.py

-=-
Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/AccessControl/Permissions.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/AccessControl/Permissions.py	2010-05-16 19:45:33 UTC (rev 112385)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/AccessControl/Permissions.py	2010-05-16 19:52:04 UTC (rev 112386)
@@ -66,11 +66,12 @@
 webdav_lock_items='WebDAV Lock items'
 webdav_unlock_items='WebDAV Unlock items'
 
-# BBB - conditional dependency
-try:
-    from DocumentTemplate import permissions
-except ImportError:
-    pass
-else:
-    change_dtml_documents = permissions.change_dtml_documents
-    change_dtml_methods = permissions.change_dtml_methods
+
+from zope.deferredimport import deprecated
+
+new_loc = 'DocumentTemplate.permissions'
+
+deprecated("Please import from %s" % new_loc,
+    change_dtml_documents = '%s:change_dtml_documents' % new_loc,
+    change_dtml_methods = '%s:change_dtml_methods' % new_loc,
+)

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLDocument.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLDocument.py	2010-05-16 19:45:33 UTC (rev 112385)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLDocument.py	2010-05-16 19:52:04 UTC (rev 112386)
@@ -15,11 +15,11 @@
 from urllib import quote
 
 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.special_dtml import DTMLFile
 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 DTMLMethod
 from OFS.PropertyManager import PropertyManager

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/Testing/ZopeTestCase/testFunctional.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/Testing/ZopeTestCase/testFunctional.py	2010-05-16 19:45:33 UTC (rev 112385)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/Testing/ZopeTestCase/testFunctional.py	2010-05-16 19:52:04 UTC (rev 112386)
@@ -29,7 +29,7 @@
 from AccessControl.Permissions import view
 from AccessControl.Permissions import manage_properties
 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 urllib import urlencode