[CMF-checkins] CVS: CMF/CMFCore - CMFCoreExceptions.py:1.4 __init__.py:1.26

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv16655/CMFCore

Modified Files:
	CMFCoreExceptions.py __init__.py 
Log Message:
- replaced allow_module / allow_class by ModuleSecurityInfo.declarePublic
- added CopyError to CMFCoreExceptions


=== CMF/CMFCore/CMFCoreExceptions.py 1.3 => 1.4 ===
--- CMF/CMFCore/CMFCoreExceptions.py:1.3	Thu Sep 25 07:36:48 2003
+++ CMF/CMFCore/CMFCoreExceptions.py	Sun Jan  4 11:57:00 2004
@@ -15,41 +15,42 @@
 $Id$
 """
 
-from AccessControl import allow_class
+from AccessControl import ModuleSecurityInfo
 from AccessControl import Unauthorized
+from OFS.CopySupport import CopyError
 from webdav.Lockable import ResourceLockedError
 
 
+security = ModuleSecurityInfo('Products.CMFCore.CMFCoreExceptions')
+security.declarePublic('CopyError')
+security.declarePublic('Unauthorized')
+
+
+security.declarePublic('CMFError')
 class CMFError(Exception):
     """ The root of all CMF evil.
     """
 
-allow_class(CMFError)
-
 
+security.declarePublic('CMFNotImplementedError')
 class CMFNotImplementedError(NotImplementedError, CMFError):
     """ NotImplementedError in CMF.
     """
 
-allow_class(CMFNotImplementedError)
-
 
+security.declarePublic('CMFResourceLockedError')
 class CMFResourceLockedError(ResourceLockedError, CMFError):
     """ ResourceLockedError in CMF.
     """
 
-allow_class(CMFResourceLockedError)
-
 
+security.declarePublic('CMFUnauthorizedError')
 class CMFUnauthorizedError(Unauthorized, CMFError):
     """ Unauthorized error in CMF.
     """
 
-allow_class(CMFUnauthorizedError)
-
 
+security.declarePublic('IllegalHTML')
 class IllegalHTML(ValueError, CMFError):
     """ Illegal HTML error.
     """
-
-allow_class(IllegalHTML)


=== CMF/CMFCore/__init__.py 1.25 => 1.26 ===
--- CMF/CMFCore/__init__.py:1.25	Thu Sep 25 06:29:59 2003
+++ CMF/CMFCore/__init__.py	Sun Jan  4 11:57:00 2004
@@ -17,8 +17,6 @@
 
 from sys import modules
 
-from AccessControl import allow_module
-
 import PortalObject, PortalContent, PortalFolder
 import MembershipTool, WorkflowTool, CatalogTool, DiscussionTool
 import ActionsTool, UndoTool, RegistrationTool, SkinsTool
@@ -36,8 +34,6 @@
 from CMFCorePermissions import AddPortalFolders
 
 
-allow_module('Products.CMFCore.CMFCoreExceptions')
-
 # Old name that some third-party packages may need.
 ADD_FOLDERS_PERMISSION = AddPortalFolders
 HAS_PAGE_TEMPLATES = 1
@@ -142,4 +138,3 @@
                            PortalFolder.manage_addPortalFolder, )
                      , fti=PortalFolder.factory_type_information
                      ).initialize( context )
-