import Products.CMFCore.permissions and Products.CMFCore.expandpath from the right places

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29480 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/ActiveObject.py

@@ -33,10 +33,7 @@ from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from ActivityRuntimeEnvironment import getActivityRuntimeEnvironment
 
-try:
-  from Products.CMFCore import permissions
-except ImportError:
-  from Products.CMFCore import CMFCorePermissions as permissions
+from Products.CMFCore import permissions
 
 DEFAULT_ACTIVITY = 'SQLDict'
 

product/CMFActivity/ActiveProcess.py

@@ -28,7 +28,7 @@
 
 from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from AccessControl import ClassSecurityInfo
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions as CMFCorePermissions
 from Products.ERP5Type.Base import Base
 from Products.ERP5Type import PropertySheet
 from BTrees.IOBTree import IOBTree

product/CMFActivity/ActivityTool.py

@@ -33,7 +33,7 @@ import sys
 from types import StringType
 import re
 
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore import permissions as CMFCorePermissions
 from Products.ERP5Type.Core.Folder import Folder
 from Products.CMFActivity.ActiveResult import ActiveResult
 from Products.CMFActivity.ActiveObject import DEFAULT_ACTIVITY

product/ERP5Form/FSForm.py

 from Products.ERP5Type import Globals
 from AccessControl import ClassSecurityInfo
 
-from Products.CMFCore.CMFCorePermissions import View, ViewManagementScreens
+from Products.CMFCore.permissions import View, ViewManagementScreens
 from Products.CMFCore.FSObject import FSObject
 from Products.CMFCore.DirectoryView import registerFileExtension,\
-     registerMetaType, expandpath
+     registerMetaType
+from Products.CMFCore.utils import expandpath
 
 from Products.ERP5Form import _dtmldir
 from Products.ERP5Form.Form import ERP5Form

product/Formulator/FSForm.py

@@ -8,7 +8,8 @@ except ImportError:
     from Products.CMFCore.permissions import View
     from Products.CMFCore.FSObject import FSObject
     from Products.CMFCore.DirectoryView import registerFileExtension,\
-                                               registerMetaType, expandpath
+                                               registerMetaType
+    from Products.CMFCore.utils import expandpath
 else:
     # use FileSystemSite product
     from Products.FileSystemSite.Permissions import View

product/MailTemplates/FSMailTemplate.py

@@ -7,7 +7,8 @@
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from App.class_init import default__class_init__ as InitializeClass
-from Products.CMFCore.FSPageTemplate import FSPageTemplate,expandpath
+from Products.CMFCore.FSPageTemplate import FSPageTemplate
+from Products.CMFCore.utils import expandpath
 from Products.CMFCore.DirectoryView import registerFileExtension
 from Products.CMFCore.DirectoryView import registerMetaType