[CMF-checkins] CVS: Products/CMFCore - PortalFolder.py:1.69

[Stefan H. Holek]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv11540/CMFCore

Modified Files:
	PortalFolder.py 
Log Message:
- import missing DeletObjects permission.
- raise AccessControl_Unauthorized, not plain Unauthorized.


=== Products/CMFCore/PortalFolder.py 1.68 => 1.69 ===
--- Products/CMFCore/PortalFolder.py:1.68	Mon Aug  9 14:47:48 2004
+++ Products/CMFCore/PortalFolder.py	Tue Aug 10 05:47:10 2004
@@ -39,6 +39,7 @@
 from permissions import ManagePortal
 from permissions import ManageProperties
 from permissions import View
+from permissions import DeleteObjects
 from utils import getToolByName
 
 
@@ -450,16 +451,16 @@
             if permission_name is not None:
 
                 if not sm.checkPermission(permission_name,self):
-                    raise Unauthorized, method_name
+                    raise AccessControl_Unauthorized, method_name
 
                 if validate_src:
 
                     if not sm.validate(None, parent, None, object):
-                        raise Unauthorized, object_id
+                        raise AccessControl_Unauthorized, object_id
 
                 if validate_src > 1:
                     if not sm.checkPermission(DeleteObjects, parent):
-                        raise Unauthorized
+                        raise AccessControl_Unauthorized
 
                 # validation succeeded
                 securityChecksDone = 1
@@ -478,18 +479,18 @@
                     factory = aq_parent(aq_inner(meth))
 
                 if not sm.validate(None, factory, None, meth):
-                    raise Unauthorized, method_name
+                    raise AccessControl_Unauthorized, method_name
 
                 # Ensure the user is allowed to access the object on the
                 # clipboard.
                 if validate_src:
 
                     if not sm.validate(None, parent, None, object):
-                        raise Unauthorized, object_id
+                        raise AccessControl_Unauthorized, object_id
 
                 if validate_src > 1: # moving
                     if not sm.checkPermission(DeleteObjects, parent):
-                        raise Unauthorized
+                        raise AccessControl_Unauthorized
 
                 securityChecksDone = 1