Thu Apr 29 11:37:09 EDT 2004

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

Modified Files:
      Tag: tseaver-permissiongeddon-branch
	ActionInformation.py ActionProviderBase.py ActionsTool.py 
	CMFCatalogAware.py CMFCoreExceptions.py CMFCorePermissions.py 
	CachingPolicyManager.py CatalogTool.py ContentTypeRegistry.py 
	DirectoryView.py DiscussionTool.py FSDTMLMethod.py FSFile.py 
	FSImage.py FSObject.py FSPageTemplate.py FSPropertiesObject.py 
	FSPythonScript.py FSSTXMethod.py FSZSQLMethod.py 
	MemberDataTool.py MembershipTool.py PortalContent.py 
	PortalFolder.py PortalObject.py RegistrationTool.py 
	SkinsContainer.py SkinsTool.py TypesTool.py URLTool.py 
	UndoTool.py WorkflowTool.py __init__.py utils.py 
Added Files:
      Tag: tseaver-permissiongeddon-branch
	exceptions.py permissions.py 
Log Message:



 - Enforced new "local permissions" pattern:  each top-level CMF product
   should have a 'permissions.py' module which imports / declares all
   permissions used within the product;  other modules within the product
   should import from there.  Likewise for 'exceptions.py'. CMFCorePermissions
   delenda est!



=== Added File CMF/CMFCore/exceptions.py ===
##############################################################################
#
# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
""" Declare Exceptions used throughout the CMF.

$Id: exceptions.py,v 1.1.2.1 2004/04/29 15:36:35 tseaver Exp $
"""

from AccessControl import ModuleSecurityInfo
from AccessControl import Unauthorized as AccessControl_Unauthorized
from OFS.CopySupport import CopyError
from webdav.Lockable import ResourceLockedError
from zExceptions import Unauthorized as zExceptions_Unauthorized


security = ModuleSecurityInfo('Products.CMFCore.exceptions')

# Use AccessControl_Unauthorized to raise Unauthorized errors and
# zExceptions_Unauthorized to catch them all.

security.declarePublic('AccessControl_Unauthorized')
security.declarePublic('CopyError')
security.declarePublic('ResourceLockedError')
security.declarePublic('zExceptions_Unauthorized')


security.declarePublic('IllegalHTML')
class IllegalHTML(ValueError):
    """ Illegal HTML error.
    """


security.declarePublic('EditingConflict')
class EditingConflict(Exception):
    """ Editing conflict error.
    """


=== Added File CMF/CMFCore/permissions.py ===
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
""" CMFCore product permissions.

$Id: permissions.py,v 1.1.2.1 2004/04/29 15:36:35 tseaver Exp $
"""

import Products
from AccessControl import ModuleSecurityInfo
from AccessControl import Permissions
from AccessControl.Permission import _registeredPermissions
from AccessControl.Permission import pname
from Globals import ApplicationDefaultPermissions


security = ModuleSecurityInfo('Products.CMFCore.permissions')

#
# General Zope permissions
#

security.declarePublic('AccessContentsInformation')
AccessContentsInformation = Permissions.access_contents_information

security.declarePublic('ChangePermissions')
ChangePermissions = Permissions.change_permissions

security.declarePublic('DeleteObjects')
DeleteObjects = Permissions.delete_objects

security.declarePublic('FTPAccess')
FTPAccess = Permissions.ftp_access

security.declarePublic('ManageProperties')
ManageProperties = Permissions.manage_properties

security.declarePublic('ManageUsers')
ManageUsers = Permissions.manage_users

security.declarePublic('UndoChanges')
UndoChanges = Permissions.undo_changes

security.declarePublic('View')
View = Permissions.view

security.declarePublic('ViewManagementScreens')
ViewManagementScreens = Permissions.view_management_screens

security.declarePrivate('setDefaultRoles')
def setDefaultRoles(permission, roles):
    '''
    Sets the defaults roles for a permission.
    '''
    # XXX This ought to be in AccessControl.SecurityInfo.
    registered = _registeredPermissions
    if not registered.has_key(permission):
        registered[permission] = 1
        Products.__ac_permissions__=(
            Products.__ac_permissions__+((permission,(),roles),))
        mangled = pname(permission)
        setattr(ApplicationDefaultPermissions, mangled, roles)

# Note that we can only use the default Zope roles in calls to
# setDefaultRoles().  The default Zope roles are:
# Anonymous, Manager, and Owner.

#
# CMF Base Permissions
#

security.declarePublic('ListFolderContents')
ListFolderContents = 'List folder contents'
setDefaultRoles( ListFolderContents, ( 'Manager', 'Owner' ) )

security.declarePublic('ListUndoableChanges')
ListUndoableChanges = 'List undoable changes'
setDefaultRoles( ListUndoableChanges, ('Manager',) )  # + Member

security.declarePublic('AccessInactivePortalContent')
AccessInactivePortalContent = 'Access inactive portal content'
setDefaultRoles(AccessInactivePortalContent, ('Manager',))

security.declarePublic('ModifyCookieCrumblers')
ModifyCookieCrumblers = 'Modify Cookie Crumblers'
setDefaultRoles(ModifyCookieCrumblers, ('Manager',))

security.declarePublic('ReplyToItem')
ReplyToItem = 'Reply to item'
setDefaultRoles(ReplyToItem, ('Manager',))  # + Member

security.declarePublic('ManagePortal')
ManagePortal = 'Manage portal'
setDefaultRoles(ManagePortal, ('Manager',))

security.declarePublic('ModifyPortalContent')
ModifyPortalContent = 'Modify portal content'
setDefaultRoles(ModifyPortalContent, ('Manager',))

security.declarePublic('ListPortalMembers')
ListPortalMembers = 'List portal members'
setDefaultRoles( ListPortalMembers, ('Manager',) )  # + Member

security.declarePublic('AddPortalFolders')
AddPortalFolders = 'Add portal folders'
setDefaultRoles(AddPortalFolders, ('Owner','Manager'))  # + Member

security.declarePublic('AddPortalContent')
AddPortalContent = 'Add portal content'
setDefaultRoles(AddPortalContent, ('Owner','Manager',))  # + Member

security.declarePublic('AddPortalMember')
AddPortalMember = 'Add portal member'
setDefaultRoles(AddPortalMember, ('Anonymous', 'Manager',))

security.declarePublic('SetOwnPassword')
SetOwnPassword = 'Set own password'
setDefaultRoles(SetOwnPassword, ('Manager',))  # + Member

security.declarePublic('SetOwnProperties')
SetOwnProperties = 'Set own properties'
setDefaultRoles(SetOwnProperties, ('Manager',))  # + Member

security.declarePublic('ChangeLocalRoles')
ChangeLocalRoles = 'Change local roles'
setDefaultRoles(ChangeLocalRoles, ('Owner', 'Manager'))

security.declarePublic('MailForgottenPassword')
MailForgottenPassword = 'Mail forgotten password'
setDefaultRoles(MailForgottenPassword, ('Anonymous', 'Manager',))


#
# Workflow Permissions
#

security.declarePublic('RequestReview')
RequestReview = 'Request review'
setDefaultRoles(RequestReview, ('Owner', 'Manager',))

security.declarePublic('ReviewPortalContent')
ReviewPortalContent = 'Review portal content'
setDefaultRoles(ReviewPortalContent, ('Manager',))  # + Reviewer

security.declarePublic('AccessFuturePortalContent')
AccessFuturePortalContent = 'Access future portal content'
setDefaultRoles(AccessFuturePortalContent, ('Manager',))  # + Reviewer


=== CMF/CMFCore/ActionInformation.py 1.19 => 1.19.6.1 ===

--- CMF/CMFCore/ActionInformation.py:1.19	Tue Dec  2 12:06:14 2003
+++ CMF/CMFCore/ActionInformation.py	Thu Apr 29 11:36:35 2004
@@ -23,7 +23,7 @@
 from OFS.SimpleItem import SimpleItem
 
 from Expression import Expression
-from CMFCorePermissions import View
+from permissions import View
 from utils import getToolByName
 
 


=== CMF/CMFCore/ActionProviderBase.py 1.23 => 1.23.4.1 ===
--- CMF/CMFCore/ActionProviderBase.py:1.23	Mon Jan  5 12:29:20 2004
+++ CMF/CMFCore/ActionProviderBase.py	Thu Apr 29 11:36:35 2004
@@ -22,7 +22,7 @@
 
 from ActionInformation import ActionInformation
 from ActionInformation import getOAI
-from CMFCorePermissions import ManagePortal
+from permissions import ManagePortal
 from Expression import Expression
 from Expression import getExprContext
 from interfaces.portal_actions import ActionProvider as IActionProvider


=== CMF/CMFCore/ActionsTool.py 1.47 => 1.47.2.1 ===
--- CMF/CMFCore/ActionsTool.py:1.47	Mon Feb 23 07:55:02 2004
+++ CMF/CMFCore/ActionsTool.py	Thu Apr 29 11:36:35 2004
@@ -28,8 +28,8 @@
 from ActionInformation import ActionInformation
 from ActionInformation import getOAI
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import ListFolderContents
-from CMFCorePermissions import ManagePortal
+from permissions import ListFolderContents
+from permissions import ManagePortal
 from Expression import Expression
 from Expression import getExprContext
 from interfaces.portal_actions import portal_actions as IActionsTool


=== CMF/CMFCore/CMFCatalogAware.py 1.17 => 1.17.4.1 ===
--- CMF/CMFCore/CMFCatalogAware.py:1.17	Thu Jan  1 20:05:52 2004
+++ CMF/CMFCore/CMFCatalogAware.py	Thu Apr 29 11:36:35 2004
@@ -21,9 +21,9 @@
 from Globals import DTMLFile
 from Globals import InitializeClass
 
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import ModifyPortalContent
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import ModifyPortalContent
 from utils import _dtmldir
 from utils import getToolByName
 


=== CMF/CMFCore/CMFCoreExceptions.py 1.5 => 1.5.4.1 ===
--- CMF/CMFCore/CMFCoreExceptions.py:1.5	Wed Jan  7 11:31:46 2004
+++ CMF/CMFCore/CMFCoreExceptions.py	Thu Apr 29 11:36:35 2004
@@ -10,36 +10,14 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-""" Declare Exceptions used throughout the CMF.
+""" Backward compatibility;  see Products.CMFCore.exceptions
 
 $Id$
 """
+from exceptions import *
 
-from AccessControl import ModuleSecurityInfo
-from AccessControl import Unauthorized as AccessControl_Unauthorized
-from OFS.CopySupport import CopyError
-from webdav.Lockable import ResourceLockedError
-from zExceptions import Unauthorized as zExceptions_Unauthorized
+from warnings import warn
 
-
-security = ModuleSecurityInfo('Products.CMFCore.CMFCoreExceptions')
-
-# Use AccessControl_Unauthorized to raise Unauthorized errors and
-# zExceptions_Unauthorized to catch them all.
-
-security.declarePublic('AccessControl_Unauthorized')
-security.declarePublic('CopyError')
-security.declarePublic('ResourceLockedError')
-security.declarePublic('zExceptions_Unauthorized')
-
-
-security.declarePublic('IllegalHTML')
-class IllegalHTML(ValueError):
-    """ Illegal HTML error.
-    """
-
-
-security.declarePublic('EditingConflict')
-class EditingConflict(Exception):
-    """ Editing conflict error.
-    """
+warn( "The module, 'Products.CMFCore.CMFCoreExceptions' is a deprecated "
+      "compatiblity alias for 'Products.CMFCore.exceptions';  please use "
+      "the new module instead.", DeprecationWarning)


=== CMF/CMFCore/CMFCorePermissions.py 1.18 => 1.18.10.1 ===
--- CMF/CMFCore/CMFCorePermissions.py:1.18	Mon Oct 20 10:25:05 2003
+++ CMF/CMFCore/CMFCorePermissions.py	Thu Apr 29 11:36:35 2004
@@ -10,147 +10,15 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-""" Declare named permissions used throughout the CMF.
+""" Backward compatibility;  see Products.CMFCore.permissions
 
 $Id$
 """
 
-import Products
-from AccessControl import ModuleSecurityInfo
-from AccessControl import Permissions
-from AccessControl.Permission import _registeredPermissions
-from AccessControl.Permission import pname
-from Globals import ApplicationDefaultPermissions
+from permissions import *
 
+from warnings import warn
 
-security = ModuleSecurityInfo('Products.CMFCore.CMFCorePermissions')
-
-#
-# General Zope permissions
-#
-
-security.declarePublic('AccessContentsInformation')
-AccessContentsInformation = Permissions.access_contents_information
-
-security.declarePublic('ChangePermissions')
-ChangePermissions = Permissions.change_permissions
-
-security.declarePublic('DeleteObjects')
-DeleteObjects = Permissions.delete_objects
-
-security.declarePublic('FTPAccess')
-FTPAccess = Permissions.ftp_access
-
-security.declarePublic('ManageProperties')
-ManageProperties = Permissions.manage_properties
-
-security.declarePublic('ManageUsers')
-ManageUsers = Permissions.manage_users
-
-security.declarePublic('UndoChanges')
-UndoChanges = Permissions.undo_changes
-
-security.declarePublic('View')
-View = Permissions.view
-
-security.declarePublic('ViewManagementScreens')
-ViewManagementScreens = Permissions.view_management_screens
-
-security.declarePrivate('setDefaultRoles')
-def setDefaultRoles(permission, roles):
-    '''
-    Sets the defaults roles for a permission.
-    '''
-    # XXX This ought to be in AccessControl.SecurityInfo.
-    registered = _registeredPermissions
-    if not registered.has_key(permission):
-        registered[permission] = 1
-        Products.__ac_permissions__=(
-            Products.__ac_permissions__+((permission,(),roles),))
-        mangled = pname(permission)
-        setattr(ApplicationDefaultPermissions, mangled, roles)
-
-# Note that we can only use the default Zope roles in calls to
-# setDefaultRoles().  The default Zope roles are:
-# Anonymous, Manager, and Owner.
-
-#
-# CMF Base Permissions
-#
-
-security.declarePublic('ListFolderContents')
-ListFolderContents = 'List folder contents'
-setDefaultRoles( ListFolderContents, ( 'Manager', 'Owner' ) )
-
-security.declarePublic('ListUndoableChanges')
-ListUndoableChanges = 'List undoable changes'
-setDefaultRoles( ListUndoableChanges, ('Manager',) )  # + Member
-
-security.declarePublic('AccessInactivePortalContent')
-AccessInactivePortalContent = 'Access inactive portal content'
-setDefaultRoles(AccessInactivePortalContent, ('Manager',))
-
-security.declarePublic('ModifyCookieCrumblers')
-ModifyCookieCrumblers = 'Modify Cookie Crumblers'
-setDefaultRoles(ModifyCookieCrumblers, ('Manager',))
-
-security.declarePublic('ReplyToItem')
-ReplyToItem = 'Reply to item'
-setDefaultRoles(ReplyToItem, ('Manager',))  # + Member
-
-security.declarePublic('ManagePortal')
-ManagePortal = 'Manage portal'
-setDefaultRoles(ManagePortal, ('Manager',))
-
-security.declarePublic('ModifyPortalContent')
-ModifyPortalContent = 'Modify portal content'
-setDefaultRoles(ModifyPortalContent, ('Manager',))
-
-security.declarePublic('ListPortalMembers')
-ListPortalMembers = 'List portal members'
-setDefaultRoles( ListPortalMembers, ('Manager',) )  # + Member
-
-security.declarePublic('AddPortalFolders')
-AddPortalFolders = 'Add portal folders'
-setDefaultRoles(AddPortalFolders, ('Owner','Manager'))  # + Member
-
-security.declarePublic('AddPortalContent')
-AddPortalContent = 'Add portal content'
-setDefaultRoles(AddPortalContent, ('Owner','Manager',))  # + Member
-
-security.declarePublic('AddPortalMember')
-AddPortalMember = 'Add portal member'
-setDefaultRoles(AddPortalMember, ('Anonymous', 'Manager',))
-
-security.declarePublic('SetOwnPassword')
-SetOwnPassword = 'Set own password'
-setDefaultRoles(SetOwnPassword, ('Manager',))  # + Member
-
-security.declarePublic('SetOwnProperties')
-SetOwnProperties = 'Set own properties'
-setDefaultRoles(SetOwnProperties, ('Manager',))  # + Member
-
-security.declarePublic('ChangeLocalRoles')
-ChangeLocalRoles = 'Change local roles'
-setDefaultRoles(ChangeLocalRoles, ('Owner', 'Manager'))
-
-security.declarePublic('MailForgottenPassword')
-MailForgottenPassword = 'Mail forgotten password'
-setDefaultRoles(MailForgottenPassword, ('Anonymous', 'Manager',))
-
-
-#
-# Workflow Permissions
-#
-
-security.declarePublic('RequestReview')
-RequestReview = 'Request review'
-setDefaultRoles(RequestReview, ('Owner', 'Manager',))
-
-security.declarePublic('ReviewPortalContent')
-ReviewPortalContent = 'Review portal content'
-setDefaultRoles(ReviewPortalContent, ('Manager',))  # + Reviewer
-
-security.declarePublic('AccessFuturePortalContent')
-AccessFuturePortalContent = 'Access future portal content'
-setDefaultRoles(AccessFuturePortalContent, ('Manager',))  # + Reviewer
+warn( "The module, 'Products.CMFCore.CMFCorePermissions' is a deprecated "
+      "compatiblity alias for 'Products.CMFCore.permissions';  please use "
+      "the new module instead.", DeprecationWarning)


=== CMF/CMFCore/CachingPolicyManager.py 1.12 => 1.12.2.1 ===
--- CMF/CMFCore/CachingPolicyManager.py:1.12	Wed Mar 31 23:10:17 2004
+++ CMF/CMFCore/CachingPolicyManager.py	Thu Apr 29 11:36:35 2004
@@ -25,8 +25,8 @@
 from Products.PageTemplates.Expressions import getEngine
 from Products.PageTemplates.Expressions import SecureModuleImporter
 
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
+from permissions import ManagePortal
+from permissions import View
 from Expression import Expression
 from interfaces.CachingPolicyManager \
         import CachingPolicyManager as ICachingPolicyManager


=== CMF/CMFCore/CatalogTool.py 1.52 => 1.52.2.1 ===
--- CMF/CMFCore/CatalogTool.py:1.52	Mon Apr 26 08:34:06 2004
+++ CMF/CMFCore/CatalogTool.py	Thu Apr 29 11:36:35 2004
@@ -29,9 +29,9 @@
 from utils import getToolByName
 from utils import UniqueObject
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import AccessInactivePortalContent
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
+from permissions import AccessInactivePortalContent
+from permissions import ManagePortal
+from permissions import View
 
 from interfaces.portal_catalog \
         import IndexableObjectWrapper as IIndexableObjectWrapper


=== CMF/CMFCore/ContentTypeRegistry.py 1.14 => 1.14.36.1 ===
--- CMF/CMFCore/ContentTypeRegistry.py:1.14	Thu Feb 13 03:28:42 2003
+++ CMF/CMFCore/ContentTypeRegistry.py	Thu Apr 29 11:36:35 2004
@@ -20,7 +20,7 @@
 from Globals import DTMLFile, InitializeClass, PersistentMapping
 from ZPublisher.mapply import mapply
 
-from CMFCorePermissions import ManagePortal
+from permissions import ManagePortal
 from utils import _dtmldir, getToolByName
 
 import re, os, urllib


=== CMF/CMFCore/DirectoryView.py 1.42 => 1.42.2.1 ===
--- CMF/CMFCore/DirectoryView.py:1.42	Sat Apr  3 11:57:29 2004
+++ CMF/CMFCore/DirectoryView.py	Thu Apr 29 11:36:35 2004
@@ -33,8 +33,8 @@
 from OFS.ObjectManager import bad_id
 from zLOG import LOG, ERROR
 
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ManagePortal
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
 from FSMetadata import FSMetadata
 from FSObject import BadFile
 from utils import _dtmldir


=== CMF/CMFCore/DiscussionTool.py 1.14 => 1.14.6.1 ===
--- CMF/CMFCore/DiscussionTool.py:1.14	Thu Nov 27 10:06:49 2003
+++ CMF/CMFCore/DiscussionTool.py	Thu Apr 29 11:36:35 2004
@@ -21,10 +21,10 @@
 from AccessControl import ClassSecurityInfo
 
 from ActionProviderBase import OldstyleActionProviderBase
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import ReplyToItem
-from CMFCorePermissions import View
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import ReplyToItem
+from permissions import View
 from interfaces.Discussions import OldDiscussable as IOldDiscussable
 from interfaces.portal_discussion \
         import oldstyle_portal_discussion as IOldstyleDiscussionTool


=== CMF/CMFCore/FSDTMLMethod.py 1.21 => 1.21.6.1 ===
--- CMF/CMFCore/FSDTMLMethod.py:1.21	Sun Dec  7 15:44:05 2003
+++ CMF/CMFCore/FSDTMLMethod.py	Thu Apr 29 11:36:35 2004
@@ -23,9 +23,9 @@
 from OFS.Cache import Cacheable
 
 from utils import _dtmldir, _setCacheHeaders
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension, registerMetaType, expandpath
 from FSObject import FSObject
 


=== CMF/CMFCore/FSFile.py 1.9 => 1.9.2.1 ===
--- CMF/CMFCore/FSFile.py:1.9	Tue Mar 30 15:53:50 2004
+++ CMF/CMFCore/FSFile.py	Thu Apr 29 11:36:35 2004
@@ -23,9 +23,9 @@
 from OFS.Image import File
 from OFS.content_types import guess_content_type
 
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType
 from FSObject import FSObject


=== CMF/CMFCore/FSImage.py 1.16 => 1.16.6.1 ===
--- CMF/CMFCore/FSImage.py:1.16	Sun Dec  7 15:44:05 2003
+++ CMF/CMFCore/FSImage.py	Thu Apr 29 11:36:35 2004
@@ -22,9 +22,9 @@
 from OFS.Cache import Cacheable
 from OFS.Image import Image, getImageInfo
 
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType
 from FSObject import FSObject


=== CMF/CMFCore/FSObject.py 1.16 => 1.16.6.1 ===
--- CMF/CMFCore/FSObject.py:1.16	Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/FSObject.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from DateTime import DateTime
 from Products.PythonScripts.standard import html_quote
 
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import ManagePortal
+from permissions import View
+from permissions import ViewManagementScreens
 from utils import expandpath
 from utils import getToolByName
 


=== CMF/CMFCore/FSPageTemplate.py 1.24 => 1.24.2.1 ===
--- CMF/CMFCore/FSPageTemplate.py:1.24	Sat Mar  6 16:55:15 2004
+++ CMF/CMFCore/FSPageTemplate.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate, Src
 
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType
 from FSObject import FSObject


=== CMF/CMFCore/FSPropertiesObject.py 1.16 => 1.16.12.1 ===
--- CMF/CMFCore/FSPropertiesObject.py:1.16	Mon Sep  1 11:59:41 2003
+++ CMF/CMFCore/FSPropertiesObject.py	Thu Apr 29 11:36:35 2004
@@ -23,8 +23,10 @@
 from AccessControl import ClassSecurityInfo
 
 from utils import _dtmldir
-from DirectoryView import registerFileExtension, registerMetaType, expandpath
-from CMFCorePermissions import ViewManagementScreens
+from DirectoryView import registerFileExtension
+from DirectoryView import registerMetaType
+from DirectoryView import expandpath
+from permissions import ViewManagementScreens
 from FSObject import FSObject
 
 class FSPropertiesObject (FSObject, PropertyManager):


=== CMF/CMFCore/FSPythonScript.py 1.24 => 1.24.6.1 ===
--- CMF/CMFCore/FSPythonScript.py:1.24	Sun Dec  7 15:44:05 2003
+++ CMF/CMFCore/FSPythonScript.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from Shared.DC.Scripts.Script import Script
 from ComputedAttribute import ComputedAttribute
 
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType
 from FSObject import FSObject


=== CMF/CMFCore/FSSTXMethod.py 1.9 => 1.9.6.1 ===
--- CMF/CMFCore/FSSTXMethod.py:1.9	Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/FSSTXMethod.py	Thu Apr 29 11:36:35 2004
@@ -18,9 +18,9 @@
 import Globals
 from AccessControl import ClassSecurityInfo
 
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
-from CMFCorePermissions import ViewManagementScreens
+from permissions import FTPAccess
+from permissions import View
+from permissions import ViewManagementScreens
 from DirectoryView import registerFileExtension
 from DirectoryView import registerMetaType
 from FSObject import FSObject


=== CMF/CMFCore/FSZSQLMethod.py 1.4 => 1.4.12.1 ===
--- CMF/CMFCore/FSZSQLMethod.py:1.4	Mon Sep  1 11:59:41 2003
+++ CMF/CMFCore/FSZSQLMethod.py	Thu Apr 29 11:36:35 2004
@@ -15,11 +15,14 @@
 from AccessControl import ClassSecurityInfo
 from zLOG import LOG,ERROR
 
-from Products.CMFCore.CMFCorePermissions import View, ViewManagementScreens
-from Products.CMFCore.DirectoryView import registerFileExtension, registerMetaType, expandpath
-from Products.CMFCore.FSObject import FSObject
-
 from Products.ZSQLMethods.SQL import SQL
+
+from permissions import View
+from permissions import ViewManagementScreens
+from DirectoryView import registerFileExtension
+from DirectoryView import registerMetaType
+from DirectoryView import expandpath
+from FSObject import FSObject
 
 from utils import _dtmldir
 


=== CMF/CMFCore/MemberDataTool.py 1.32 => 1.32.6.1 ===
--- CMF/CMFCore/MemberDataTool.py:1.32	Sun Dec  7 15:44:05 2003
+++ CMF/CMFCore/MemberDataTool.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from ZPublisher.Converters import type_converters
 from Acquisition import aq_inner, aq_parent, aq_base
 from AccessControl import ClassSecurityInfo
-from CMFCorePermissions import ViewManagementScreens
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import SetOwnProperties
+from permissions import ViewManagementScreens
+from permissions import ManagePortal
+from permissions import SetOwnProperties
 from ActionProviderBase import ActionProviderBase
 
 from interfaces.portal_memberdata import portal_memberdata as IMemberDataTool


=== CMF/CMFCore/MembershipTool.py 1.45 => 1.45.2.1 ===
--- CMF/CMFCore/MembershipTool.py:1.45	Thu Jan 29 11:34:06 2004
+++ CMF/CMFCore/MembershipTool.py	Thu Apr 29 11:36:35 2004
@@ -14,10 +14,8 @@
 
 $Id$
 """
-
 from types import StringType
-from utils import UniqueObject, _getAuthenticatedUser, _checkPermission
-from utils import getToolByName, _dtmldir
+
 from OFS.Folder import Folder
 from Acquisition import aq_base
 from Acquisition import aq_inner
@@ -31,14 +29,19 @@
 from ZODB.POSException import ConflictError
 
 from ActionProviderBase import ActionProviderBase
-from CMFCoreExceptions import AccessControl_Unauthorized
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ChangeLocalRoles
-from CMFCorePermissions import ListPortalMembers
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import ManageUsers
-from CMFCorePermissions import SetOwnPassword
-from CMFCorePermissions import View
+from exceptions import AccessControl_Unauthorized
+from permissions import AccessContentsInformation
+from permissions import ChangeLocalRoles
+from permissions import ListPortalMembers
+from permissions import ManagePortal
+from permissions import ManageUsers
+from permissions import SetOwnPassword
+from permissions import View
+from utils import UniqueObject
+from utils import _getAuthenticatedUser
+from utils import _checkPermission
+from utils import getToolByName
+from utils import _dtmldir
 
 from interfaces.portal_membership \
         import portal_membership as IMembershipTool


=== CMF/CMFCore/PortalContent.py 1.45 => 1.45.4.1 ===
--- CMF/CMFCore/PortalContent.py:1.45	Wed Jan  7 11:31:46 2004
+++ CMF/CMFCore/PortalContent.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from DynamicType import DynamicType
 from utils import _getViewFor
 from CMFCatalogAware import CMFCatalogAware
-from CMFCoreExceptions import ResourceLockedError
-from CMFCorePermissions import FTPAccess
-from CMFCorePermissions import View
+from exceptions import ResourceLockedError
+from permissions import FTPAccess
+from permissions import View
 
 
 # Old names that some third-party packages may need.


=== CMF/CMFCore/PortalFolder.py 1.60 => 1.60.2.1 ===
--- CMF/CMFCore/PortalFolder.py:1.60	Mon Apr 12 14:01:20 2004
+++ CMF/CMFCore/PortalFolder.py	Thu Apr 29 11:36:35 2004
@@ -16,15 +16,19 @@
 """
 
 import sys
-import re, base64, marshal
+import re
+import base64
+import marshal
 from warnings import warn
 
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
+from Acquisition import aq_parent, aq_inner, aq_base
 from Globals import DTMLFile
 from Globals import InitializeClass
 from OFS.Folder import Folder
 from OFS.ObjectManager import REPLACEABLE
+
 try:
     from OFS.OrderSupport import OrderSupport
     if not 'subset_ids' in \
@@ -34,18 +38,17 @@
 except ImportError:
     # for Zope versions before 2.7.0
     from OrderSupport import OrderSupport
-from Acquisition import aq_parent, aq_inner, aq_base
 
 from CMFCatalogAware import CMFCatalogAware
-from CMFCoreExceptions import AccessControl_Unauthorized
-from CMFCoreExceptions import zExceptions_Unauthorized
-from CMFCorePermissions import AddPortalContent
-from CMFCorePermissions import AddPortalFolders
-from CMFCorePermissions import ChangeLocalRoles
-from CMFCorePermissions import ListFolderContents
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import ManageProperties
-from CMFCorePermissions import View
+from exceptions import AccessControl_Unauthorized
+from exceptions import zExceptions_Unauthorized
+from permissions import AddPortalContent
+from permissions import AddPortalFolders
+from permissions import ChangeLocalRoles
+from permissions import ListFolderContents
+from permissions import ManagePortal
+from permissions import ManageProperties
+from permissions import View
 from DynamicType import DynamicType
 from utils import _checkPermission
 from utils import getToolByName


=== CMF/CMFCore/PortalObject.py 1.9 => 1.9.36.1 ===
--- CMF/CMFCore/PortalObject.py:1.9	Thu Feb 13 03:31:01 2003
+++ CMF/CMFCore/PortalObject.py	Thu Apr 29 11:36:35 2004
@@ -19,13 +19,13 @@
 
 from PortalFolder import PortalFolder
 from Skinnable import SkinnableObjectManager
-from CMFCorePermissions import AddPortalMember
-from CMFCorePermissions import SetOwnPassword
-from CMFCorePermissions import SetOwnProperties
-from CMFCorePermissions import MailForgottenPassword
-from CMFCorePermissions import RequestReview
-from CMFCorePermissions import ReviewPortalContent
-from CMFCorePermissions import AccessFuturePortalContent
+from permissions import AddPortalMember
+from permissions import SetOwnPassword
+from permissions import SetOwnProperties
+from permissions import MailForgottenPassword
+from permissions import RequestReview
+from permissions import ReviewPortalContent
+from permissions import AccessFuturePortalContent
 
 PORTAL_SKINS_TOOL_ID = 'portal_skins'
 


=== CMF/CMFCore/RegistrationTool.py 1.21 => 1.21.12.1 ===
--- CMF/CMFCore/RegistrationTool.py:1.21	Mon Sep  1 11:18:34 2003
+++ CMF/CMFCore/RegistrationTool.py	Thu Apr 29 11:36:35 2004
@@ -25,9 +25,9 @@
 from string import digits
 
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import AddPortalMember
-from CMFCorePermissions import MailForgottenPassword
-from CMFCorePermissions import ManagePortal
+from permissions import AddPortalMember
+from permissions import MailForgottenPassword
+from permissions import ManagePortal
 from utils import UniqueObject
 from utils import _checkPermission
 from utils import _limitGrantedRoles


=== CMF/CMFCore/SkinsContainer.py 1.9 => 1.9.2.1 ===
--- CMF/CMFCore/SkinsContainer.py:1.9	Fri Feb  6 05:02:59 2004
+++ CMF/CMFCore/SkinsContainer.py	Thu Apr 29 11:36:35 2004
@@ -19,7 +19,7 @@
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass
 
-from CMFCorePermissions import AccessContentsInformation
+from permissions import AccessContentsInformation
 from interfaces.portal_skins import SkinsContainer as ISkinsContainer
 
 


=== CMF/CMFCore/SkinsTool.py 1.28 => 1.28.2.1 ===
--- CMF/CMFCore/SkinsTool.py:1.28	Thu Feb  5 07:51:59 2004
+++ CMF/CMFCore/SkinsTool.py	Thu Apr 29 11:36:35 2004
@@ -31,9 +31,9 @@
 from Products.PythonScripts.PythonScript import PythonScript
 
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import View
 from interfaces.portal_skins import portal_skins as ISkinsTool
 from SkinsContainer import SkinsContainer
 from utils import _dtmldir


=== CMF/CMFCore/TypesTool.py 1.67 => 1.67.2.1 ===
--- CMF/CMFCore/TypesTool.py:1.67	Mon Mar  8 08:46:07 2004
+++ CMF/CMFCore/TypesTool.py	Thu Apr 29 11:36:35 2004
@@ -34,9 +34,9 @@
 from interfaces.portal_types import portal_types as ITypesTool
 
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import AccessContentsInformation
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import View
 from utils import UniqueObject
 from utils import SimpleItemWithProperties
 from utils import _dtmldir


=== CMF/CMFCore/URLTool.py 1.4 => 1.4.36.1 ===
--- CMF/CMFCore/URLTool.py:1.4	Thu Feb 13 02:44:48 2003
+++ CMF/CMFCore/URLTool.py	Thu Apr 29 11:36:35 2004
@@ -23,8 +23,8 @@
 from OFS.SimpleItem import SimpleItem
 
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import ManagePortal
-from CMFCorePermissions import View
+from permissions import ManagePortal
+from permissions import View
 from utils import _dtmldir
 from utils import UniqueObject
 


=== CMF/CMFCore/UndoTool.py 1.16 => 1.16.6.1 ===
--- CMF/CMFCore/UndoTool.py:1.16	Thu Nov 27 10:14:11 2003
+++ CMF/CMFCore/UndoTool.py	Thu Apr 29 11:36:35 2004
@@ -26,8 +26,8 @@
 from Expression import Expression
 from ActionInformation import ActionInformation
 from ActionProviderBase import ActionProviderBase
-from CMFCorePermissions import ListUndoableChanges
-from CMFCorePermissions import ManagePortal
+from permissions import ListUndoableChanges
+from permissions import ManagePortal
 
 from interfaces.portal_undo import portal_undo as IUndoTool
 


=== CMF/CMFCore/WorkflowTool.py 1.43 => 1.43.2.1 ===
--- CMF/CMFCore/WorkflowTool.py:1.43	Mon Mar  8 08:46:07 2004
+++ CMF/CMFCore/WorkflowTool.py	Thu Apr 29 11:36:35 2004
@@ -23,12 +23,14 @@
 from Acquisition import aq_base, aq_inner, aq_parent
 
 from ActionProviderBase import OldstyleActionProviderBase
-from CMFCorePermissions import ManagePortal
+from permissions import ManagePortal
 from interfaces.portal_workflow import portal_workflow as IWorkflowTool
 from utils import _dtmldir
 from utils import getToolByName
 from utils import UniqueObject
-from WorkflowCore import WorkflowException, ObjectDeleted, ObjectMoved
+from WorkflowCore import WorkflowException
+from WorkflowCore import ObjectDeleted
+from WorkflowCore import ObjectMoved
 
 AUTO_MIGRATE_WORKFLOW_TOOLS = 0  # Set to 1 to auto-migrate
 


=== CMF/CMFCore/__init__.py 1.26 => 1.26.4.1 ===
--- CMF/CMFCore/__init__.py:1.26	Sun Jan  4 11:57:00 2004
+++ CMF/CMFCore/__init__.py	Thu Apr 29 11:36:35 2004
@@ -31,7 +31,7 @@
 import CachingPolicyManager
 import utils
 
-from CMFCorePermissions import AddPortalFolders
+from permissions import AddPortalFolders
 
 
 # Old name that some third-party packages may need.


=== CMF/CMFCore/utils.py 1.50 => 1.50.2.1 ===
--- CMF/CMFCore/utils.py:1.50	Mon Mar  8 13:53:58 2004
+++ CMF/CMFCore/utils.py	Thu Apr 29 11:36:35 2004
@@ -18,7 +18,8 @@
 import os
 from os import path as os_path
 import re
-from types import StringType, UnicodeType
+from types import StringType
+from types import UnicodeType
 from warnings import warn
 
 from AccessControl import ClassSecurityInfo
@@ -27,7 +28,10 @@
 from AccessControl.Permission import Permission
 from AccessControl.PermissionRole import rolesForPermissionOn
 from AccessControl.Role import gather_permissions
-from Acquisition import aq_base, aq_get, aq_inner, aq_parent
+from Acquisition import aq_base
+from Acquisition import aq_get
+from Acquisition import aq_inner
+from Acquisition import aq_parent
 from ExtensionClass import Base
 from Globals import HTMLFile
 from Globals import ImageFile
@@ -43,7 +47,7 @@
 from Products.PageTemplates.Expressions import getEngine
 from Products.PageTemplates.Expressions import SecureModuleImporter
 
-from CMFCoreExceptions import AccessControl_Unauthorized
+from exceptions import AccessControl_Unauthorized
 
 
 security = ModuleSecurityInfo( 'Products.CMFCore.utils' )


