[Zope-Checkins] SVN: Zope/trunk/src/ Update code to use AccessControl.class_init instead of App.class_init
Hanno Schlichting
hannosch at hannosch.eu
Sat Jun 5 16:23:39 EDT 2010
Log message for revision 113172:
Update code to use AccessControl.class_init instead of App.class_init
Changed:
U Zope/trunk/src/App/ApplicationManager.py
U Zope/trunk/src/App/CacheManager.py
U Zope/trunk/src/App/DavLockManager.py
U Zope/trunk/src/App/FactoryDispatcher.py
U Zope/trunk/src/App/ImageFile.py
U Zope/trunk/src/App/Management.py
U Zope/trunk/src/App/Permission.py
U Zope/trunk/src/App/PersistentExtra.py
U Zope/trunk/src/App/Product.py
U Zope/trunk/src/App/Undo.py
U Zope/trunk/src/App/tests/test_class_init.py
U Zope/trunk/src/HelpSys/APIHelpTopic.py
U Zope/trunk/src/HelpSys/HelpSys.py
U Zope/trunk/src/HelpSys/HelpTopic.py
U Zope/trunk/src/HelpSys/HelpUtil.py
U Zope/trunk/src/HelpSys/ObjectRef.py
U Zope/trunk/src/OFS/Application.py
U Zope/trunk/src/OFS/Cache.py
U Zope/trunk/src/OFS/CopySupport.py
U Zope/trunk/src/OFS/DTMLDocument.py
U Zope/trunk/src/OFS/DTMLMethod.py
U Zope/trunk/src/OFS/FindSupport.py
U Zope/trunk/src/OFS/Folder.py
U Zope/trunk/src/OFS/History.py
U Zope/trunk/src/OFS/Image.py
U Zope/trunk/src/OFS/ObjectManager.py
U Zope/trunk/src/OFS/OrderSupport.py
U Zope/trunk/src/OFS/PropertyManager.py
U Zope/trunk/src/OFS/PropertySheets.py
U Zope/trunk/src/OFS/SimpleItem.py
U Zope/trunk/src/OFS/Traversable.py
U Zope/trunk/src/OFS/ZDOM.py
U Zope/trunk/src/OFS/misc_.py
U Zope/trunk/src/OFS/tests/test_registerclass.py
U Zope/trunk/src/Products/BTreeFolder2/BTreeFolder2.py
U Zope/trunk/src/Products/ExternalMethod/ExternalMethod.py
U Zope/trunk/src/Products/Five/browser/metaconfigure.py
U Zope/trunk/src/Products/Five/tests/testing/fancycontent.py
U Zope/trunk/src/Products/Five/tests/testing/simplecontent.py
U Zope/trunk/src/Products/Five/viewlet/metaconfigure.py
U Zope/trunk/src/Products/MailHost/MailHost.py
U Zope/trunk/src/Products/OFSP/Draft.py
U Zope/trunk/src/Products/OFSP/Version.py
U Zope/trunk/src/Products/PageTemplates/PageTemplateFile.py
U Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py
U Zope/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
U Zope/trunk/src/Products/PythonScripts/PythonScript.py
U Zope/trunk/src/Products/PythonScripts/help/ModuleAccess.stx
U Zope/trunk/src/Products/Sessions/BrowserIdManager.py
U Zope/trunk/src/Products/Sessions/SessionDataManager.py
U Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py
U Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py
U Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
U Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py
U Zope/trunk/src/Products/Transience/Transience.py
U Zope/trunk/src/Products/Transience/TransientObject.py
U Zope/trunk/src/Products/ZCTextIndex/ZCTextIndex.py
U Zope/trunk/src/Products/ZCatalog/ZCatalog.py
U Zope/trunk/src/Products/ZCatalog/ZCatalogIndexes.py
U Zope/trunk/src/Products/ZODBMountPoint/MountedObject.py
U Zope/trunk/src/Products/ZReST/ZReST.py
U Zope/trunk/src/Products/ZSQLMethods/SQL.py
U Zope/trunk/src/Shared/DC/Scripts/Bindings.py
U Zope/trunk/src/Shared/DC/Scripts/BindingsUI.py
U Zope/trunk/src/Shared/DC/Scripts/Script.py
U Zope/trunk/src/Shared/DC/ZRDB/Connection.py
U Zope/trunk/src/Shared/DC/ZRDB/DA.py
U Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py
U Zope/trunk/src/webdav/Collection.py
U Zope/trunk/src/webdav/Lockable.py
U Zope/trunk/src/webdav/NullResource.py
U Zope/trunk/src/webdav/Resource.py
-=-
Modified: Zope/trunk/src/App/ApplicationManager.py
===================================================================
--- Zope/trunk/src/App/ApplicationManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/ApplicationManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -21,11 +21,11 @@
import sys
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.requestmethod import requestmethod
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import Implicit
from App.CacheManager import CacheManager
-from App.class_init import InitializeClass
from App.config import getConfiguration
from App.DavLockManager import DavLockManager
from App.special_dtml import DTMLFile
Modified: Zope/trunk/src/App/CacheManager.py
===================================================================
--- Zope/trunk/src/App/CacheManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/CacheManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,7 +17,7 @@
$Id$'''
__version__='$Revision: 1.31 $'[11:-2]
-from App.class_init import InitializeClass
+from AccessControl.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.ImageFile import ImageFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/App/DavLockManager.py
===================================================================
--- Zope/trunk/src/App/DavLockManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/DavLockManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -13,11 +13,11 @@
__version__ = "$Revision: 1.8 $"[11:-2]
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.SimpleItem import Item
from webdav.Lockable import wl_isLocked
Modified: Zope/trunk/src/App/FactoryDispatcher.py
===================================================================
--- Zope/trunk/src/App/FactoryDispatcher.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/FactoryDispatcher.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -16,13 +16,13 @@
import sys
import types
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.PermissionMapping import aqwrap
from AccessControl.Owned import UnownableOwner
from Acquisition import Acquired
from Acquisition import aq_base
from Acquisition import Implicit
-from App.class_init import InitializeClass
def _product_packages():
"""Returns all product packages including the regularly defined
Modified: Zope/trunk/src/App/ImageFile.py
===================================================================
--- Zope/trunk/src/App/ImageFile.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/ImageFile.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -19,9 +19,9 @@
import stat
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Explicit
-from App.class_init import InitializeClass
from App.Common import package_home
from App.Common import rfc1123_date
from App.config import getConfiguration
Modified: Zope/trunk/src/App/Management.py
===================================================================
--- Zope/trunk/src/App/Management.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/Management.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -22,8 +22,8 @@
from zope.interface import implements
from AccessControl import getSecurityManager, Unauthorized
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
-from App.class_init import InitializeClass
from App.interfaces import INavigation
from App.special_dtml import HTMLFile
from App.special_dtml import DTMLFile
Modified: Zope/trunk/src/App/Permission.py
===================================================================
--- Zope/trunk/src/App/Permission.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/Permission.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,10 +14,10 @@
'''
+from AccessControl.class_init import InitializeClass
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from OFS.SimpleItem import Item
from Persistence import Persistent
Modified: Zope/trunk/src/App/PersistentExtra.py
===================================================================
--- Zope/trunk/src/App/PersistentExtra.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/PersistentExtra.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -42,9 +42,9 @@
from zope.interface import classImplements
from Persistence import Persistent
- from App.class_init import default__class_init__
+ from AccessControl.class_init import InitializeClass
from App.interfaces import IPersistentExtra
- Persistent.__class_init__ = default__class_init__
+ Persistent.__class_init__ = InitializeClass
for k, v in PersistentUtil.__dict__.items():
if k[0] != '_':
Modified: Zope/trunk/src/App/Product.py
===================================================================
--- Zope/trunk/src/App/Product.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/Product.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -38,10 +38,10 @@
import transaction
+from AccessControl.class_init import InitializeClass
from AccessControl.Owned import UnownableOwner
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.unauthorized import Unauthorized
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.Folder import Folder
Modified: Zope/trunk/src/App/Undo.py
===================================================================
--- Zope/trunk/src/App/Undo.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/Undo.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -19,8 +19,8 @@
from Acquisition import aq_parent
from AccessControl import getSecurityManager
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import undo_changes
-from App.class_init import InitializeClass
from App.interfaces import IUndoSupport
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/App/tests/test_class_init.py
===================================================================
--- Zope/trunk/src/App/tests/test_class_init.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/App/tests/test_class_init.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -21,7 +21,7 @@
Check when the class has an ExtensionClass as attribute.
>>> import ExtensionClass
- >>> from App.class_init import InitializeClass
+ >>> from AccessControl.class_init import InitializeClass
>>> class AnotherClass(ExtensionClass.Base):
... _need__name__ = 1
Modified: Zope/trunk/src/HelpSys/APIHelpTopic.py
===================================================================
--- Zope/trunk/src/HelpSys/APIHelpTopic.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/HelpSys/APIHelpTopic.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,8 +17,8 @@
import types
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from Persistence import Persistent
Modified: Zope/trunk/src/HelpSys/HelpSys.py
===================================================================
--- Zope/trunk/src/HelpSys/HelpSys.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/HelpSys/HelpSys.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -12,12 +12,12 @@
##############################################################################
from cgi import escape
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import add_documents_images_and_files
from AccessControl.Permissions import view as View
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.special_dtml import HTML
from OFS.ObjectManager import ObjectManager
Modified: Zope/trunk/src/HelpSys/HelpTopic.py
===================================================================
--- Zope/trunk/src/HelpSys/HelpTopic.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/HelpSys/HelpTopic.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -12,11 +12,11 @@
##############################################################################
import os
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import view as View
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.ImageFile import ImageFile
from App.special_dtml import DTMLFile
from App.special_dtml import HTML
Modified: Zope/trunk/src/HelpSys/HelpUtil.py
===================================================================
--- Zope/trunk/src/HelpSys/HelpUtil.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/HelpSys/HelpUtil.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,8 +18,8 @@
import re
import sys
+from AccessControl.class_init import InitializeClass
from Acquisition import Implicit
-from App.class_init import default__class_init__
from App.Dialogs import MessageDialog
from App.special_dtml import HTML
from Persistence import Persistent
Modified: Zope/trunk/src/HelpSys/ObjectRef.py
===================================================================
--- Zope/trunk/src/HelpSys/ObjectRef.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/HelpSys/ObjectRef.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,8 +17,8 @@
import sys
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from HelpSys.HelpUtil import classobject
from HelpSys.HelpUtil import HelpBase
Modified: Zope/trunk/src/OFS/Application.py
===================================================================
--- Zope/trunk/src/OFS/Application.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/Application.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -25,11 +25,11 @@
import App.ProductRegistry
import transaction
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
+from AccessControl.Permission import ApplicationDefaultPermissions
from AccessControl.User import UserFolder
from Acquisition import aq_base
from App.ApplicationManager import ApplicationManager
-from App.class_init import InitializeClass
-from App.class_init import ApplicationDefaultPermissions
from App.config import getConfiguration
from App.Product import doInstall
from DateTime import DateTime
Modified: Zope/trunk/src/OFS/Cache.py
===================================================================
--- Zope/trunk/src/OFS/Cache.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/Cache.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,6 +18,7 @@
import sys
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
@@ -27,7 +28,6 @@
from Acquisition import aq_get
from Acquisition import aq_inner
from Acquisition import aq_parent
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
ZCM_MANAGERS = '__ZCacheManager_ids__'
Modified: Zope/trunk/src/OFS/CopySupport.py
===================================================================
--- Zope/trunk/src/OFS/CopySupport.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/CopySupport.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -30,13 +30,13 @@
from AccessControl import ClassSecurityInfo
from AccessControl import getSecurityManager
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.Permissions import copy_or_move
from AccessControl.Permissions import delete_objects
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from App.special_dtml import HTML
from App.special_dtml import DTMLFile
Modified: Zope/trunk/src/OFS/DTMLDocument.py
===================================================================
--- Zope/trunk/src/OFS/DTMLDocument.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/DTMLDocument.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,7 +15,7 @@
from urllib import quote
from AccessControl import getSecurityManager
-from App.class_init import InitializeClass
+from AccessControl.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.special_dtml import HTML
from DocumentTemplate.permissions import change_dtml_methods
Modified: Zope/trunk/src/OFS/DTMLMethod.py
===================================================================
--- Zope/trunk/src/OFS/DTMLMethod.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/DTMLMethod.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,10 +14,10 @@
"""
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.Role import RoleManager
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.special_dtml import HTML
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/OFS/FindSupport.py
===================================================================
--- Zope/trunk/src/OFS/FindSupport.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/FindSupport.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,11 +18,11 @@
from string import translate
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
from AccessControl.Permission import name_trans
from AccessControl.Permissions import view_management_screens
from Acquisition import aq_base
from App.special_dtml import DTMLFile
-from App.class_init import InitializeClass
from DateTime.DateTime import DateTime
from DocumentTemplate.DT_Util import Eval
from DocumentTemplate.DT_Util import InstanceDict
Modified: Zope/trunk/src/OFS/Folder.py
===================================================================
--- Zope/trunk/src/OFS/Folder.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/Folder.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,12 +17,12 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import add_page_templates
from AccessControl.Permissions import add_user_folders
from AccessControl.Role import RoleManager
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.unauthorized import Unauthorized
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from webdav.Collection import Collection
from zope.interface import implements
Modified: Zope/trunk/src/OFS/History.py
===================================================================
--- Zope/trunk/src/OFS/History.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/History.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,11 +18,11 @@
import difflib
from struct import pack, unpack
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_history
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
from ExtensionClass import Base
Modified: Zope/trunk/src/OFS/Image.py
===================================================================
--- Zope/trunk/src/OFS/Image.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/Image.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -19,6 +19,7 @@
from mimetools import choose_boundary
import struct
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_images_and_files
from AccessControl.Permissions import view_management_screens
from AccessControl.Permissions import view as View
@@ -27,7 +28,6 @@
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
from Persistence import Persistent
Modified: Zope/trunk/src/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/src/OFS/ObjectManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/ObjectManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -26,6 +26,7 @@
import sys
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
from AccessControl.Permission import getPermissions
from AccessControl.Permissions import view_management_screens
from AccessControl.Permissions import access_contents_information
@@ -36,7 +37,6 @@
from AccessControl.ZopeSecurityPolicy import getRoles
from Acquisition import aq_base
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.Common import is_acquired
from App.config import getConfiguration
from App.Dialogs import MessageDialog
Modified: Zope/trunk/src/OFS/OrderSupport.py
===================================================================
--- Zope/trunk/src/OFS/OrderSupport.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/OrderSupport.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,11 +17,11 @@
import warnings
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import manage_properties
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from App.class_init import InitializeClass
from DocumentTemplate.sequence import sort
from zope.interface import implements
from zope.container.contained import notifyContainerModified
Modified: Zope/trunk/src/OFS/PropertyManager.py
===================================================================
--- Zope/trunk/src/OFS/PropertyManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/PropertyManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,11 +17,11 @@
from cgi import escape
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import manage_properties
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from App.class_init import InitializeClass
from ExtensionClass import Base
from App.special_dtml import DTMLFile
from App.Dialogs import MessageDialog
Modified: Zope/trunk/src/OFS/PropertySheets.py
===================================================================
--- Zope/trunk/src/OFS/PropertySheets.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/PropertySheets.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,6 +18,7 @@
import time
import sys
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import manage_properties
from AccessControl.Permissions import view_management_screens
@@ -26,7 +27,6 @@
from Acquisition import aq_base
from Acquisition import aq_parent
from Acquisition import Implicit, Explicit
-from App.class_init import InitializeClass
from App.Common import iso8601_date
from App.Common import rfc1123_date
from App.Dialogs import MessageDialog
Modified: Zope/trunk/src/OFS/SimpleItem.py
===================================================================
--- Zope/trunk/src/OFS/SimpleItem.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/SimpleItem.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -25,6 +25,7 @@
import sys
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.Owned import Owned
@@ -39,7 +40,6 @@
from Acquisition import aq_parent
from Acquisition import Implicit
from App.Management import Tabs
-from App.class_init import InitializeClass
from App.special_dtml import HTML
from App.special_dtml import DTMLFile
from App.Undo import UndoSupport
Modified: Zope/trunk/src/OFS/Traversable.py
===================================================================
--- Zope/trunk/src/OFS/Traversable.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/Traversable.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,6 +17,7 @@
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.unauthorized import Unauthorized
@@ -27,7 +28,6 @@
from Acquisition import aq_inner
from Acquisition import aq_parent
from Acquisition.interfaces import IAcquirer
-from App.class_init import InitializeClass
from OFS.interfaces import ITraversable
from zExceptions import NotFound
from ZODB.POSException import ConflictError
Modified: Zope/trunk/src/OFS/ZDOM.py
===================================================================
--- Zope/trunk/src/OFS/ZDOM.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/ZDOM.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,13 +15,13 @@
All standard Zope objects support DOM to a limited extent.
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.Permissions import access_contents_information
from Acquisition import Explicit
from Acquisition import Implicit
from Acquisition import aq_base
from Acquisition import aq_parent
-from App.class_init import InitializeClass
# Node type codes
Modified: Zope/trunk/src/OFS/misc_.py
===================================================================
--- Zope/trunk/src/OFS/misc_.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/misc_.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -11,8 +11,8 @@
#
##############################################################################
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.ImageFile import ImageFile
class misc_:
Modified: Zope/trunk/src/OFS/tests/test_registerclass.py
===================================================================
--- Zope/trunk/src/OFS/tests/test_registerclass.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/OFS/tests/test_registerclass.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -16,8 +16,8 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Zope/trunk/src/Products/BTreeFolder2/BTreeFolder2.py
===================================================================
--- Zope/trunk/src/Products/BTreeFolder2/BTreeFolder2.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/BTreeFolder2/BTreeFolder2.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -22,12 +22,12 @@
import sys
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import view_management_screens
from Acquisition import aq_base
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from BTrees.Length import Length
from BTrees.OIBTree import OIBTree
Modified: Zope/trunk/src/Products/ExternalMethod/ExternalMethod.py
===================================================================
--- Zope/trunk/src/Products/ExternalMethod/ExternalMethod.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ExternalMethod/ExternalMethod.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -22,6 +22,7 @@
import sys
import traceback
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_external_methods
from AccessControl.Permissions import view_management_screens
from AccessControl.Permissions import view as View
@@ -29,7 +30,6 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Acquired
from Acquisition import Explicit
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from App.Extensions import getObject
from App.Extensions import getPath
Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py
===================================================================
--- Zope/trunk/src/Products/Five/browser/metaconfigure.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Five/browser/metaconfigure.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -37,11 +37,11 @@
from zope.browserpage.metaconfigure import _handle_menu
from zope.browserpage.metaconfigure import _handle_for
+from AccessControl.class_init import InitializeClass
from AccessControl.security import getSecurityInfo
from AccessControl.security import protectClass
from AccessControl.security import protectName
from AccessControl.security import CheckerPrivateId
-from App.class_init import InitializeClass
from Products.Five.browser import BrowserView
from Products.Five.browser.resource import FileResourceFactory
Modified: Zope/trunk/src/Products/Five/tests/testing/fancycontent.py
===================================================================
--- Zope/trunk/src/Products/Five/tests/testing/fancycontent.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Five/tests/testing/fancycontent.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,9 +15,9 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Explicit
-from App.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Zope/trunk/src/Products/Five/tests/testing/simplecontent.py
===================================================================
--- Zope/trunk/src/Products/Five/tests/testing/simplecontent.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Five/tests/testing/simplecontent.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,8 +15,8 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Zope/trunk/src/Products/Five/viewlet/metaconfigure.py
===================================================================
--- Zope/trunk/src/Products/Five/viewlet/metaconfigure.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Five/viewlet/metaconfigure.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -25,9 +25,9 @@
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.viewlet import interfaces
+from AccessControl.class_init import InitializeClass
from AccessControl.security import protectClass
from AccessControl.security import protectName
-from App.class_init import InitializeClass
from Products.Five.viewlet import manager
from Products.Five.viewlet import viewlet
Modified: Zope/trunk/src/Products/MailHost/MailHost.py
===================================================================
--- Zope/trunk/src/Products/MailHost/MailHost.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/MailHost/MailHost.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -36,12 +36,12 @@
from threading import Lock
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.Permissions import change_configuration, view
from AccessControl.Permissions import use_mailhost_services
from AccessControl.Role import RoleManager
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
from Persistence import Persistent
Modified: Zope/trunk/src/Products/OFSP/Draft.py
===================================================================
--- Zope/trunk/src/Products/OFSP/Draft.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/OFSP/Draft.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -11,8 +11,8 @@
#
##############################################################################
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from OFS.SimpleItem import Item
from Persistence import Persistent
Modified: Zope/trunk/src/Products/OFSP/Version.py
===================================================================
--- Zope/trunk/src/Products/OFSP/Version.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/OFSP/Version.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,8 +14,8 @@
__version__='$Revision: 1.55 $'[11:-2]
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from OFS.SimpleItem import Item
from Persistence import Persistent
from OFS.ObjectManager import BeforeDeleteException
Modified: Zope/trunk/src/Products/PageTemplates/PageTemplateFile.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/PageTemplateFile.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/PageTemplates/PageTemplateFile.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,9 +14,9 @@
import os
from logging import getLogger
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
-from App.class_init import InitializeClass
from App.Common import package_home
from App.special_dtml import DTMLFile
from App.config import getConfiguration
@@ -57,7 +57,7 @@
func_code = FuncCode((), 0)
_v_last_read = 0
- # needed by App.class_init.InitializeClass
+ # needed by AccessControl.class_init.InitializeClass
_need__name__ = 1
_default_bindings = {'name_subpath': 'traverse_subpath'}
Modified: Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py
===================================================================
--- Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/PageTemplates/ZopePageTemplate.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,6 +17,7 @@
import os
import re
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_page_templates
from AccessControl.Permissions import ftp_access
from AccessControl.Permissions import view
@@ -27,7 +28,6 @@
from Acquisition import Acquired
from Acquisition import Explicit
from Acquisition import aq_get
-from App.class_init import InitializeClass
from App.Common import package_home
from App.ImageFile import ImageFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
===================================================================
--- Zope/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,10 +18,10 @@
import os
from datetime import datetime
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import manage_zcatalog_indexes
from AccessControl.Permissions import view
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.Common import package_home
from App.special_dtml import DTMLFile
from BTrees.IIBTree import IISet
Modified: Zope/trunk/src/Products/PythonScripts/PythonScript.py
===================================================================
--- Zope/trunk/src/Products/PythonScripts/PythonScript.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/PythonScripts/PythonScript.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -27,13 +27,13 @@
import traceback
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.requestmethod import requestmethod
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.ZopeGuards import get_safe_globals, guarded_getattr
from AccessControl.ZopeGuards import get_safe_globals, guarded_getattr
from Acquisition import aq_parent
-from App.class_init import InitializeClass
from App.Common import package_home
from App.Dialogs import MessageDialog
from App.special_dtml import DTMLFile
Modified: Zope/trunk/src/Products/PythonScripts/help/ModuleAccess.stx
===================================================================
--- Zope/trunk/src/Products/PythonScripts/help/ModuleAccess.stx 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/PythonScripts/help/ModuleAccess.stx 2010-06-05 20:23:38 UTC (rev 113172)
@@ -21,7 +21,7 @@
from Products.PythonScripts.Utility import allow_module, allow_class
from AccessControl import ModuleSecurityInfo, ClassSecurityInfo
- from App.class_init import InitializeClass
+ from AccessControl.class_init import InitializeClass
4. For each module to which you want to allow access, add
security declarations in '__init__.py'.
Modified: Zope/trunk/src/Products/Sessions/BrowserIdManager.py
===================================================================
--- Zope/trunk/src/Products/Sessions/BrowserIdManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Sessions/BrowserIdManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -22,13 +22,13 @@
from urlparse import urlparse
from urlparse import urlunparse
+from AccessControl.class_init import InitializeClass
from AccessControl.Owned import Owned
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
from Acquisition import aq_parent
from Acquisition import aq_inner
-from App.class_init import InitializeClass
from App.Management import Tabs
from App.special_dtml import DTMLFile
from Persistence import Persistent
Modified: Zope/trunk/src/Products/Sessions/SessionDataManager.py
===================================================================
--- Zope/trunk/src/Products/Sessions/SessionDataManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Sessions/SessionDataManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,11 +14,11 @@
import re
import sys
+from AccessControl.class_init import InitializeClass
from AccessControl.Owned import Owned
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from App.Management import Tabs
from OFS.SimpleItem import Item
Modified: Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py
===================================================================
--- Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/SiteAccess/VirtualHostMonster.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -2,10 +2,10 @@
Defines the VirtualHostMonster class
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view as View
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from App.special_dtml import DTMLFile
from OFS.SimpleItem import Item
Modified: Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py
===================================================================
--- Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -23,11 +23,11 @@
from random import random
from thread import allocate_lock
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.unauthorized import Unauthorized
from Acquisition import aq_base
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from OFS.SimpleItem import SimpleItem
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
Modified: Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
===================================================================
--- Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -25,10 +25,10 @@
from urllib import quote
import urlparse
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.Common import rfc1123_date
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.Cache import Cache
from OFS.Cache import CacheManager
Modified: Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py
===================================================================
--- Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -20,9 +20,9 @@
from thread import allocate_lock
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.Cache import Cache
from OFS.Cache import CacheManager
Modified: Zope/trunk/src/Products/Transience/Transience.py
===================================================================
--- Zope/trunk/src/Products/Transience/Transience.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Transience/Transience.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -24,12 +24,12 @@
import thread
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import setSecurityManager
from AccessControl.SpecialUsers import nobody
-from App.class_init import InitializeClass
from App.special_dtml import HTMLFile
from BTrees.Length import Length as BTreesLength
from BTrees.OOBTree import OOBTree
Modified: Zope/trunk/src/Products/Transience/TransientObject.py
===================================================================
--- Zope/trunk/src/Products/Transience/TransientObject.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/Transience/TransientObject.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -24,9 +24,9 @@
import thread
import time
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from Persistence import Persistent
from ZODB.POSException import ConflictError
from zope.interface import implements
Modified: Zope/trunk/src/Products/ZCTextIndex/ZCTextIndex.py
===================================================================
--- Zope/trunk/src/Products/ZCTextIndex/ZCTextIndex.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZCTextIndex/ZCTextIndex.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -18,6 +18,7 @@
from cgi import escape
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import manage_vocabulary
from AccessControl.Permissions import manage_zcatalog_indexes
from AccessControl.Permissions import query_vocabulary
@@ -27,7 +28,6 @@
from Acquisition import aq_inner
from Acquisition import aq_parent
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.SimpleItem import SimpleItem
from Persistence import Persistent
Modified: Zope/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/ZCatalog.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZCatalog/ZCatalog.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -22,13 +22,13 @@
import urllib
from warnings import warn
+from AccessControl.class_init import InitializeClass
from AccessControl.Permission import name_trans
from AccessControl.Permissions import manage_zcatalog_entries
from AccessControl.Permissions import manage_zcatalog_indexes
from AccessControl.Permissions import search_zcatalog
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/Products/ZCatalog/ZCatalogIndexes.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/ZCatalogIndexes.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZCatalog/ZCatalogIndexes.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,10 +15,10 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.Permissions import manage_zcatalog_indexes
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.Folder import Folder
from OFS.ObjectManager import IFAwareObjectManager
Modified: Zope/trunk/src/Products/ZODBMountPoint/MountedObject.py
===================================================================
--- Zope/trunk/src/Products/ZODBMountPoint/MountedObject.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZODBMountPoint/MountedObject.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -24,12 +24,12 @@
import transaction
-from App.class_init import InitializeClass
+from AccessControl.class_init import InitializeClass
+from AccessControl.ZopeGuards import guarded_getattr
from Acquisition import ImplicitAcquisitionWrapper
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
-from AccessControl.ZopeGuards import guarded_getattr
from OFS.SimpleItem import SimpleItem
from OFS.Folder import Folder
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
Modified: Zope/trunk/src/Products/ZReST/ZReST.py
===================================================================
--- Zope/trunk/src/Products/ZReST/ZReST.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZReST/ZReST.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -14,10 +14,10 @@
from docutils.writers.html4css1 import Writer
import sys
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityInfo import ModuleSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.config import getConfiguration
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/Products/ZSQLMethods/SQL.py
===================================================================
--- Zope/trunk/src/Products/ZSQLMethods/SQL.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Products/ZSQLMethods/SQL.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -16,9 +16,9 @@
$Id$'''
__version__='$Revision: 1.21 $'[11:-2]
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_database_methods
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from Shared.DC.ZRDB.DA import DA
Modified: Zope/trunk/src/Shared/DC/Scripts/Bindings.py
===================================================================
--- Zope/trunk/src/Shared/DC/Scripts/Bindings.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Shared/DC/Scripts/Bindings.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -16,6 +16,7 @@
import re
import string
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.Permissions import view_management_screens
@@ -23,7 +24,6 @@
from AccessControl.ZopeGuards import guarded_getattr
from Acquisition import aq_parent
from Acquisition import aq_inner
-from App.class_init import InitializeClass
from Persistence import Persistent
defaultBindings = {'name_context': 'context',
Modified: Zope/trunk/src/Shared/DC/Scripts/BindingsUI.py
===================================================================
--- Zope/trunk/src/Shared/DC/Scripts/BindingsUI.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Shared/DC/Scripts/BindingsUI.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -13,9 +13,9 @@
__version__='$Revision$'[11:-2]
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from Shared.DC.Scripts.Bindings import Bindings
Modified: Zope/trunk/src/Shared/DC/Scripts/Script.py
===================================================================
--- Zope/trunk/src/Shared/DC/Scripts/Script.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Shared/DC/Scripts/Script.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -20,9 +20,9 @@
from string import join
from urllib import quote
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from DocumentTemplate.DT_Util import TemplateDict
from OFS.SimpleItem import SimpleItem
Modified: Zope/trunk/src/Shared/DC/ZRDB/Connection.py
===================================================================
--- Zope/trunk/src/Shared/DC/ZRDB/Connection.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Shared/DC/ZRDB/Connection.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -21,6 +21,7 @@
import string
import sys
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import view_management_screens
from AccessControl.Permissions import change_database_connections
from AccessControl.Permissions import test_database_connections
@@ -28,7 +29,6 @@
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.Dialogs import MessageDialog
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
Modified: Zope/trunk/src/Shared/DC/ZRDB/DA.py
===================================================================
--- Zope/trunk/src/Shared/DC/ZRDB/DA.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Shared/DC/ZRDB/DA.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -19,6 +19,7 @@
import sys
from time import time
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import change_database_methods
from AccessControl.Permissions import use_database_methods
from AccessControl.Permissions import view_management_screens
@@ -26,7 +27,6 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.Extensions import getBrain
from App.special_dtml import DTMLFile
from DocumentTemplate import HTML
Modified: Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -169,7 +169,7 @@
def _installProduct(name, quiet=0):
'''Installs a Zope product.'''
- from App.class_init import InitializeClass
+ from AccessControl.class_init import InitializeClass
start = time.time()
meta_types = []
if _patched and not _installedProducts.has_key(name):
Modified: Zope/trunk/src/webdav/Collection.py
===================================================================
--- Zope/trunk/src/webdav/Collection.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/webdav/Collection.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,8 +17,8 @@
from urllib import unquote
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityManagement import getSecurityManager
-from App.class_init import InitializeClass
from zExceptions import MethodNotAllowed
from zExceptions import NotFound
from zope.interface import implements
Modified: Zope/trunk/src/webdav/Lockable.py
===================================================================
--- Zope/trunk/src/webdav/Lockable.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/webdav/Lockable.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -15,9 +15,9 @@
$Id$
"""
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from App.class_init import InitializeClass
from Persistence import PersistentMapping
from zope.interface import implements
Modified: Zope/trunk/src/webdav/NullResource.py
===================================================================
--- Zope/trunk/src/webdav/NullResource.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/webdav/NullResource.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -17,6 +17,7 @@
import sys
+from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from AccessControl.Permissions import view as View
@@ -26,7 +27,6 @@
from Acquisition import aq_base
from Acquisition import aq_parent
from Acquisition import Implicit
-from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from Persistence import Persistent
from OFS.CopySupport import CopyError
Modified: Zope/trunk/src/webdav/Resource.py
===================================================================
--- Zope/trunk/src/webdav/Resource.py 2010-06-05 20:10:56 UTC (rev 113171)
+++ Zope/trunk/src/webdav/Resource.py 2010-06-05 20:23:38 UTC (rev 113172)
@@ -23,6 +23,7 @@
from AccessControl import getSecurityManager
from AccessControl import ClassSecurityInfo
+from AccessControl.class_init import InitializeClass
from AccessControl.Permissions import delete_objects
from AccessControl.Permissions import manage_properties
from AccessControl.Permissions import view as View
@@ -32,7 +33,6 @@
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
-from App.class_init import InitializeClass
from ExtensionClass import Base
from OFS.event import ObjectClonedEvent
from OFS.event import ObjectWillBeMovedEvent
More information about the Zope-Checkins
mailing list