Thu Apr 29 11:37:09 EDT 2004

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

Modified Files:
      Tag: tseaver-permissiongeddon-branch
	DefaultWorkflow.py DiscussionItem.py DiscussionTool.py 
	Document.py DublinCore.py Favorite.py File.py Image.py Link.py 
	MembershipTool.py MetadataTool.py NewsItem.py Portal.py 
	PropertiesTool.py RegistrationTool.py SkinnedFolder.py 
	SyndicationTool.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/CMFDefault/exceptions.py ===
""" CMFDefault product exceptions

$Id: exceptions.py,v 1.1.2.1 2004/04/29 15:36:37 tseaver Exp $
"""
from AccessControl import ModuleSecurityInfo
security = ModuleSecurityInfo('Products.CMFDefault.exceptions')

security.declarePublic('AccessControl_Unauthorized')
from Products.CMFCore.exceptions import AccessControl_Unauthorized

security.declarePublic('CopyError')
from Products.CMFCore.exceptions import CopyError

security.declarePublic('EditingConflict')
from Products.CMFCore.exceptions import EditingConflict

security.declarePublic('IllegalHTML')
from Products.CMFCore.exceptions import IllegalHTML

security.declarePublic('ResourceLockedError')
from Products.CMFCore.exceptions import ResourceLockedError

security.declarePublic('zExceptions_Unauthorized')
from Products.CMFCore.exceptions import zExceptions_Unauthorized


=== Added File CMF/CMFDefault/permissions.py ===
""" CMFDefault product permissions

$Id: permissions.py,v 1.1.2.1 2004/04/29 15:36:37 tseaver Exp $
"""
from AccessControl import ModuleSecurityInfo

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

security.declarePublic('AccessContentsInformation')
from Products.CMFCore.permissions import AccessContentsInformation

security.declarePublic('AccessFuturePortalContent')
from Products.CMFCore.permissions import AccessFuturePortalContent

security.declarePublic('AddPortalContent')
from Products.CMFCore.permissions import AddPortalContent

security.declarePublic('AddPortalFolders')
from Products.CMFCore.permissions import AddPortalFolders

security.declarePublic('AddPortalMember')
from Products.CMFCore.permissions import AddPortalMember

security.declarePublic('DeleteObjects')
from Products.CMFCore.permissions import DeleteObjects

security.declarePublic('FTPAccess')
from Products.CMFCore.permissions import FTPAccess

security.declarePublic('ListFolderContents')
from Products.CMFCore.permissions import ListFolderContents

security.declarePublic('ListPortalMembers')
from Products.CMFCore.permissions import ListPortalMembers

security.declarePublic('ListUndoableChanges')
from Products.CMFCore.permissions import ListUndoableChanges

security.declarePublic('ManagePortal')
from Products.CMFCore.permissions import ManagePortal

security.declarePublic('ManageProperties')
from Products.CMFCore.permissions import ManageProperties

security.declarePublic('ManageUsers')
from Products.CMFCore.permissions import ManageUsers

security.declarePublic('ModifyPortalContent')
from Products.CMFCore.permissions import ModifyPortalContent

security.declarePublic('ReplyToItem')
from Products.CMFCore.permissions import ReplyToItem

security.declarePublic('RequestReview')
from Products.CMFCore.permissions import RequestReview

security.declarePublic('ReviewPortalContent')
from Products.CMFCore.permissions import ReviewPortalContent

security.declarePublic('SetOwnPassword')
from Products.CMFCore.permissions import SetOwnPassword

security.declarePublic('SetOwnProperties')
from Products.CMFCore.permissions import SetOwnProperties

security.declarePublic('UndoChanges')
from Products.CMFCore.permissions import UndoChanges

security.declarePublic('View')
from Products.CMFCore.permissions import View

security.declarePublic('ViewManagementScreens')
from Products.CMFCore.permissions import ViewManagementScreens




=== CMF/CMFDefault/DefaultWorkflow.py 1.23 => 1.23.4.1 ===

--- CMF/CMFDefault/DefaultWorkflow.py:1.23	Thu Jan  8 07:29:33 2004
+++ CMF/CMFDefault/DefaultWorkflow.py	Thu Apr 29 11:36:37 2004
@@ -15,16 +15,13 @@
 $Id$
 """
 
-from Acquisition import aq_base, aq_inner, aq_parent
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from Acquisition import aq_parent
 from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from Globals import InitializeClass
 
-from Products.CMFCore.CMFCoreExceptions import AccessControl_Unauthorized
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import RequestReview
-from Products.CMFCore.CMFCorePermissions import ReviewPortalContent
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFCore.interfaces.portal_workflow \
         import WorkflowDefinition as IWorkflowDefinition
 from Products.CMFCore.utils import _checkPermission
@@ -32,6 +29,12 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import SimpleItemWithProperties
 from Products.CMFCore.WorkflowTool import addWorkflowClass
+
+from exceptions import AccessControl_Unauthorized
+from permissions import ModifyPortalContent
+from permissions import RequestReview
+from permissions import ReviewPortalContent
+from permissions import View
 
 
 class DefaultWorkflowDefinition (SimpleItemWithProperties):


=== CMF/CMFDefault/DiscussionItem.py 1.40 => 1.40.2.1 ===
--- CMF/CMFDefault/DiscussionItem.py:1.40	Tue Jan 20 15:11:38 2004
+++ CMF/CMFDefault/DiscussionItem.py	Thu Apr 29 11:36:37 2004
@@ -21,15 +21,15 @@
 from OFS.Traversable import Traversable
 from DateTime import DateTime
 
-from Products.CMFCore.CMFCorePermissions import AccessContentsInformation
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ReplyToItem
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFCore.interfaces.Discussions import Discussable
 from Products.CMFCore.interfaces.Discussions import DiscussionResponse
 from Products.CMFCore.utils import getToolByName
 
 from Document import Document
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import ReplyToItem
+from permissions import View
 
 
 factory_type_information = (


=== CMF/CMFDefault/DiscussionTool.py 1.17 => 1.17.4.1 ===
--- CMF/CMFDefault/DiscussionTool.py:1.17	Thu Jan  8 07:29:33 2004
+++ CMF/CMFDefault/DiscussionTool.py	Thu Apr 29 11:36:37 2004
@@ -15,16 +15,13 @@
 $Id$
 """
 
-from Globals import InitializeClass, DTMLFile
+from Globals import InitializeClass
+from Globals import DTMLFile
 from AccessControl import ClassSecurityInfo
 from OFS.SimpleItem import SimpleItem
 
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.CMFCoreExceptions import AccessControl_Unauthorized
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import ReplyToItem
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.interfaces.portal_discussion \
         import portal_discussion as IDiscussionTool
@@ -33,6 +30,10 @@
 
 from DiscussionItem import DiscussionItemContainer
 from utils import _dtmldir
+from exceptions import AccessControl_Unauthorized
+from permissions import ManagePortal
+from permissions import ModifyPortalContent
+from permissions import ReplyToItem
 
 
 class DiscussionNotAllowed( Exception ):


=== CMF/CMFDefault/Document.py 1.65 => 1.65.2.1 ===
--- CMF/CMFDefault/Document.py:1.65	Tue Jan 20 17:26:28 2004
+++ CMF/CMFDefault/Document.py	Thu Apr 29 11:36:37 2004
@@ -15,22 +15,29 @@
 $Id$
 """
 
-from StructuredText.HTMLWithImages import HTMLWithImages
-from Globals import DTMLFile, InitializeClass
-from AccessControl import ClassSecurityInfo, getSecurityManager
+from Globals import DTMLFile
+from Globals import InitializeClass
+from AccessControl import ClassSecurityInfo
+from AccessControl import getSecurityManager
 from Acquisition import aq_base
+from DocumentTemplate.DT_Util import html_quote
+from StructuredText.HTMLWithImages import HTMLWithImages
 
 from Products.CMFCore.PortalContent import PortalContent
-from Products.CMFCore.CMFCoreExceptions import EditingConflict
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.utils import format_stx, keywordsplitter
+from Products.CMFCore.utils import format_stx
+from Products.CMFCore.utils import keywordsplitter
+
 from DublinCore import DefaultDublinCoreImpl
-from utils import parseHeadersBody, formatRFC822Headers
-from utils import SimpleHTMLParser, bodyfinder, _dtmldir
+from exceptions import EditingConflict
+from exceptions import ResourceLockedError
+from permissions import View
+from permissions import ModifyPortalContent
+from utils import parseHeadersBody
+from utils import formatRFC822Headers
+from utils import SimpleHTMLParser
+from utils import bodyfinder
+from utils import _dtmldir
 from utils import html_headcheck
-from DocumentTemplate.DT_Util import html_quote
 
 factory_type_information = (
   { 'id'             : 'Document'


=== CMF/CMFDefault/DublinCore.py 1.32 => 1.32.2.1 ===
--- CMF/CMFDefault/DublinCore.py:1.32	Wed Feb  4 12:34:57 2004
+++ CMF/CMFDefault/DublinCore.py	Thu Apr 29 11:36:37 2004
@@ -22,15 +22,17 @@
 from Globals import InitializeClass
 from OFS.PropertyManager import PropertyManager
 
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFCore.interfaces.DublinCore import CatalogableDublinCore
 from Products.CMFCore.interfaces.DublinCore import DublinCore
 from Products.CMFCore.interfaces.DublinCore import MutableDublinCore
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.WorkflowCore import WorkflowAction
 
-from utils import tuplize, _dtmldir, semi_split
+from permissions import ModifyPortalContent
+from permissions import View
+from utils import tuplize
+from utils import _dtmldir
+from utils import semi_split
 
 _marker=[]
 


=== CMF/CMFDefault/Favorite.py 1.21 => 1.21.12.1 ===
--- CMF/CMFDefault/Favorite.py:1.21	Sat Jun 28 12:31:21 2003
+++ CMF/CMFDefault/Favorite.py	Thu Apr 29 11:36:37 2004
@@ -21,8 +21,9 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.CMFCorePermissions import View, ModifyPortalContent
 
+from permissions import View
+from permissions import ModifyPortalContent
 from DublinCore import DefaultDublinCoreImpl
 from Link import Link
 


=== CMF/CMFDefault/File.py 1.27 => 1.27.12.1 ===
--- CMF/CMFDefault/File.py:1.27	Sat Jun 28 12:31:21 2003
+++ CMF/CMFDefault/File.py	Thu Apr 29 11:36:37 2004
@@ -21,11 +21,11 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.PortalContent import PortalContent
-from DublinCore import DefaultDublinCoreImpl
-
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
 from Products.CMFCore.WorkflowCore import WorkflowAction
+
+from DublinCore import DefaultDublinCoreImpl
+from permissions import View
+from permissions import ModifyPortalContent
 
 
 factory_type_information = (


=== CMF/CMFDefault/Image.py 1.25 => 1.25.12.1 ===
--- CMF/CMFDefault/Image.py:1.25	Sat Jun 28 12:31:21 2003
+++ CMF/CMFDefault/Image.py	Thu Apr 29 11:36:37 2004
@@ -20,11 +20,11 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.CMFCore.PortalContent import PortalContent
-from DublinCore import DefaultDublinCoreImpl
-
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
 from Products.CMFCore.WorkflowCore import WorkflowAction
+
+from DublinCore import DefaultDublinCoreImpl
+from permissions import View
+from permissions import ModifyPortalContent
 
 factory_type_information = (
   { 'id'             : 'Image'


=== CMF/CMFDefault/Link.py 1.29 => 1.29.8.1 ===
--- CMF/CMFDefault/Link.py:1.29	Thu Sep 25 07:36:49 2003
+++ CMF/CMFDefault/Link.py	Thu Apr 29 11:36:37 2004
@@ -21,14 +21,16 @@
 from AccessControl import ClassSecurityInfo
 from webdav.Lockable import ResourceLockedError
 
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import keywordsplitter
 
 from DublinCore import DefaultDublinCoreImpl
-from utils import formatRFC822Headers, parseHeadersBody, _dtmldir
+from permissions import View
+from permissions import ModifyPortalContent
+from utils import formatRFC822Headers
+from utils import parseHeadersBody
+from utils import _dtmldir
 
 factory_type_information = (
   { 'id'             : 'Link'


=== CMF/CMFDefault/MembershipTool.py 1.45 => 1.45.2.1 ===
--- CMF/CMFDefault/MembershipTool.py:1.45	Fri Feb 13 10:22:47 2004
+++ CMF/CMFDefault/MembershipTool.py	Thu Apr 29 11:36:37 2004
@@ -29,12 +29,12 @@
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.ActionsTool import ActionInformation as AI
 from Products.CMFCore.Expression import Expression
-from Products.CMFCore.CMFCorePermissions import ListPortalMembers
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ManageUsers
-from Products.CMFCore.CMFCorePermissions import View
 
 from Document import addDocument
+from permissions import ListPortalMembers
+from permissions import ManagePortal
+from permissions import ManageUsers
+from permissions import View
 from utils import _dtmldir
 
 from interfaces.portal_membership \


=== CMF/CMFDefault/MetadataTool.py 1.20 => 1.20.42.1 ===
--- CMF/CMFDefault/MetadataTool.py:1.20	Thu Feb 13 02:46:21 2003
+++ CMF/CMFDefault/MetadataTool.py	Thu Apr 29 11:36:37 2004
@@ -16,20 +16,22 @@
 """
 
 from OFS.SimpleItem import SimpleItem
-from Products.CMFCore.utils import UniqueObject
 from Globals import PersistentMapping
 
-from Globals import InitializeClass, DTMLFile
-from AccessControl import ClassSecurityInfo, getSecurityManager
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from utils import _dtmldir
+from Globals import InitializeClass
+from Globals import DTMLFile
+from AccessControl import ClassSecurityInfo
+from AccessControl import getSecurityManager
 
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.interfaces.portal_metadata \
         import portal_metadata as IMetadataTool
 
+from permissions import View
+from permissions import ManagePortal
+from permissions import ModifyPortalContent
+from utils import _dtmldir
 
 class MetadataElementPolicy( SimpleItem ):
     """


=== CMF/CMFDefault/NewsItem.py 1.22 => 1.22.2.1 ===
--- CMF/CMFDefault/NewsItem.py:1.22	Tue Jan 20 17:26:28 2004
+++ CMF/CMFDefault/NewsItem.py	Thu Apr 29 11:36:37 2004
@@ -18,11 +18,9 @@
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass
 
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import View
-
 from Document import Document
-
+from permissions import ModifyPortalContent
+from permissions import View
 
 factory_type_information = (
   { 'id'             : 'News Item'


=== CMF/CMFDefault/Portal.py 1.39 => 1.39.2.1 ===
--- CMF/CMFDefault/Portal.py:1.39	Sat Mar 13 07:09:56 2004
+++ CMF/CMFDefault/Portal.py	Thu Apr 29 11:36:37 2004
@@ -18,31 +18,39 @@
 from Globals import HTMLFile
 from Globals import InitializeClass
 
-from Products.CMFCore.CMFCorePermissions import AccessFuturePortalContent
-from Products.CMFCore.CMFCorePermissions import AddPortalContent
-from Products.CMFCore.CMFCorePermissions import AddPortalFolders
-from Products.CMFCore.CMFCorePermissions import DeleteObjects
-from Products.CMFCore.CMFCorePermissions import FTPAccess
-from Products.CMFCore.CMFCorePermissions import ListPortalMembers
-from Products.CMFCore.CMFCorePermissions import ListUndoableChanges
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ManageProperties
-from Products.CMFCore.CMFCorePermissions import ReplyToItem
-from Products.CMFCore.CMFCorePermissions import ReviewPortalContent
-from Products.CMFCore.CMFCorePermissions import SetOwnPassword
-from Products.CMFCore.CMFCorePermissions import SetOwnProperties
-from Products.CMFCore.CMFCorePermissions import UndoChanges
-from Products.CMFCore.CMFCorePermissions import View
-from Products.CMFCore.CMFCorePermissions import ViewManagementScreens
 from Products.CMFCore.PortalObject import PortalObjectBase
 from Products.CMFCore import PortalFolder
 from Products.CMFCore.TypesTool import ContentFactoryMetadata
 from Products.CMFCore.utils import getToolByName
-from Products.CMFTopic import Topic, topic_globals
+from Products.CMFTopic import Topic
+from Products.CMFTopic import topic_globals
+
 from DublinCore import DefaultDublinCoreImpl
+from permissions import AccessFuturePortalContent
+from permissions import AddPortalContent
+from permissions import AddPortalFolders
+from permissions import DeleteObjects
+from permissions import FTPAccess
+from permissions import ListPortalMembers
+from permissions import ListUndoableChanges
+from permissions import ManagePortal
+from permissions import ManageProperties
+from permissions import ReplyToItem
+from permissions import ReviewPortalContent
+from permissions import SetOwnPassword
+from permissions import SetOwnProperties
+from permissions import UndoChanges
+from permissions import View
+from permissions import ViewManagementScreens
 
-import Document, Image, File, Link, NewsItem, Favorite
-import DiscussionItem, SkinnedFolder
+import Document
+import Image
+import File
+import Link
+import NewsItem
+import Favorite
+import DiscussionItem
+import SkinnedFolder
 
 factory_type_information = ( Document.factory_type_information
                            + Image.factory_type_information


=== CMF/CMFDefault/PropertiesTool.py 1.12 => 1.12.6.1 ===
--- CMF/CMFDefault/PropertiesTool.py:1.12	Sun Nov 23 11:29:04 2003
+++ CMF/CMFDefault/PropertiesTool.py	Thu Apr 29 11:36:37 2004
@@ -15,21 +15,20 @@
 $Id$
 """
 
-from Products.CMFCore.utils import UniqueObject
 from OFS.SimpleItem import SimpleItem
 from Acquisition import aq_inner, aq_parent
-
 from Globals import InitializeClass, DTMLFile
 from AccessControl import ClassSecurityInfo
+
+from Products.CMFCore.utils import UniqueObject
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.Expression import Expression
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from utils import _dtmldir
-
 from Products.CMFCore.interfaces.portal_properties \
         import portal_properties as IPropertiesTool
 
+from permissions import ManagePortal
+from utils import _dtmldir
 
 class PropertiesTool(UniqueObject, SimpleItem, ActionProviderBase):
 


=== CMF/CMFDefault/RegistrationTool.py 1.24 => 1.24.6.1 ===
--- CMF/CMFDefault/RegistrationTool.py:1.24	Sun Nov 23 11:29:04 2003
+++ CMF/CMFDefault/RegistrationTool.py	Thu Apr 29 11:36:37 2004
@@ -24,8 +24,9 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.RegistrationTool import RegistrationTool as BaseTool
-from Products.CMFCore.CMFCorePermissions import AddPortalMember
-from Products.CMFCore.CMFCorePermissions import ManagePortal
+
+from permissions import AddPortalMember
+from permissions import ManagePortal
 from utils import _dtmldir
 
 


=== CMF/CMFDefault/SkinnedFolder.py 1.19 => 1.19.2.1 ===
--- CMF/CMFDefault/SkinnedFolder.py:1.19	Mon Feb 23 07:55:03 2004
+++ CMF/CMFDefault/SkinnedFolder.py	Thu Apr 29 11:36:37 2004
@@ -20,15 +20,15 @@
 from Globals import InitializeClass
 
 from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
-from Products.CMFCore.CMFCorePermissions import AddPortalContent
-from Products.CMFCore.CMFCorePermissions import ListFolderContents
-from Products.CMFCore.CMFCorePermissions import ManageProperties
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFCore.PortalFolder import PortalFolder
 from Products.CMFCore.utils import _getViewFor
 
 from DublinCore import DefaultDublinCoreImpl
+from permissions import AddPortalContent
+from permissions import ListFolderContents
+from permissions import ManageProperties
+from permissions import ModifyPortalContent
+from permissions import View
 
 factory_type_information = (
   { 'id'             : 'Skinned Folder'


=== CMF/CMFDefault/SyndicationTool.py 1.22 => 1.22.2.1 ===
--- CMF/CMFDefault/SyndicationTool.py:1.22	Wed Mar 24 06:57:28 2004
+++ CMF/CMFDefault/SyndicationTool.py	Thu Apr 29 11:36:37 2004
@@ -27,15 +27,15 @@
 
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.CMFCorePermissions import AccessContentsInformation
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.CMFCore.CMFCorePermissions import ManageProperties
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.PortalFolder import PortalFolder
 from Products.CMFCore.utils import _checkPermission
 from Products.CMFCore.utils import UniqueObject
 
 from SyndicationInfo import SyndicationInformation
+from permissions import AccessContentsInformation
+from permissions import ManagePortal
+from permissions import ManageProperties
 from utils import _dtmldir
 
 


=== CMF/CMFDefault/__init__.py 1.21 => 1.21.38.1 ===
--- CMF/CMFDefault/__init__.py:1.21	Mon Feb 24 08:58:46 2003
+++ CMF/CMFDefault/__init__.py	Thu Apr 29 11:36:37 2004
@@ -15,10 +15,6 @@
 $Id$
 """
 
-from Products import CMFCore
-
-from Products.CMFCore.CMFCorePermissions import AddPortalContent
-
 from Products.CMFCore.DirectoryView import registerDirectory
 from Products.CMFCore.utils import initializeBasesPhase1
 from Products.CMFCore.utils import initializeBasesPhase2
@@ -27,6 +23,7 @@
 from Products.CMFCore.utils import registerIcon
 
 import utils
+from permissions import AddPortalContent
  
 import Portal
 import Document


=== CMF/CMFDefault/utils.py 1.23 => 1.23.2.1 ===
--- CMF/CMFDefault/utils.py:1.23	Thu Apr 15 08:52:52 2004
+++ CMF/CMFDefault/utils.py	Thu Apr 29 11:36:37 2004
@@ -15,17 +15,20 @@
 $Id$
 """
 
+import os
+import re
 from cgi import escape
 from sgmllib import SGMLParser
-from types import ListType, StringType, TupleType, UnicodeType
-import re
-import os
+from types import ListType
+from types import StringType
+from types import TupleType
+from types import UnicodeType
 
 from Globals import package_home
 from AccessControl import ModuleSecurityInfo
 from ZTUtils.Zope import complex_marshal
 
-from Products.CMFCore.CMFCoreExceptions import IllegalHTML
+from exceptions import IllegalHTML
 
 security = ModuleSecurityInfo( 'Products.CMFDefault.utils' )
 


