Update code to use AccessControl.class_init instead of App.class_init

src/App/ApplicationManager.py

@@ -21,11 +21,11 @@ import os
 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

src/App/CacheManager.py

@@ -17,7 +17,7 @@ This class is mixed into the database manager in App.ApplicationManager.
 $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

src/App/DavLockManager.py

@@ -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

src/App/FactoryDispatcher.py

@@ -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

src/App/ImageFile.py

@@ -19,9 +19,9 @@ import os.path
 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

src/App/Management.py

@@ -22,8 +22,8 @@ import urllib
 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

src/App/Permission.py

@@ -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
 

src/App/PersistentExtra.py

@@ -42,9 +42,9 @@ def patchPersistent():
 
     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] != '_':

src/App/Product.py

@@ -38,10 +38,10 @@ import os
 
 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
 

src/App/Undo.py

@@ -19,8 +19,8 @@ from Acquisition import aq_inner
 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

src/App/tests/test_class_init.py

@@ -21,7 +21,7 @@ def test_InitializeClass():
     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
 

src/HelpSys/APIHelpTopic.py

@@ -17,8 +17,8 @@ $Id$
 
 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
 

src/HelpSys/HelpSys.py

@@ -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

src/HelpSys/HelpTopic.py

@@ -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

src/HelpSys/HelpUtil.py

@@ -18,8 +18,8 @@ __version__='$Revision: 1.12 $'[11:-2]
 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

src/HelpSys/ObjectRef.py

@@ -17,8 +17,8 @@ __version__='$Revision: 1.10 $'[11:-2]
 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

src/OFS/Application.py

@@ -25,11 +25,11 @@ import App.Product
 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

src/OFS/Cache.py

@@ -18,6 +18,7 @@ from logging import getLogger
 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_base
 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__'

src/OFS/CopySupport.py

@@ -30,13 +30,13 @@ import transaction
 
 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

src/OFS/DTMLDocument.py

@@ -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

src/OFS/DTMLMethod.py

@@ -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

src/OFS/FindSupport.py

@@ -18,11 +18,11 @@ $Id$
 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

src/OFS/Folder.py

@@ -17,12 +17,12 @@ Folders are the basic container objects and are analogous to directories.
 $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

src/OFS/History.py

@@ -18,11 +18,11 @@ from cgi import escape
 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

src/OFS/Image.py

@@ -19,6 +19,7 @@ from cStringIO import StringIO
 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.Permissions import delete_objects
 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

src/OFS/ObjectManager.py

@@ -26,6 +26,7 @@ import re
 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 import getSecurityManager
 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

src/OFS/OrderSupport.py

@@ -17,11 +17,11 @@ $Id$
 
 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

src/OFS/PropertyManager.py

@@ -17,11 +17,11 @@ $Id$
 
 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

src/OFS/PropertySheets.py

@@ -18,6 +18,7 @@ from cgi import escape
 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 AccessControl.SecurityManagement import getSecurityManager
 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

src/OFS/SimpleItem.py

@@ -25,6 +25,7 @@ import re
 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_inner
 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

src/OFS/Traversable.py

@@ -17,6 +17,7 @@ $Id$
 
 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_base
 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

src/OFS/ZDOM.py

@@ -15,13 +15,13 @@ DOM implementation in ZOPE : Read-Only methods
 
 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

src/OFS/misc_.py

@@ -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_:

src/OFS/tests/test_registerclass.py

@@ -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

src/Products/BTreeFolder2/BTreeFolder2.py

@@ -22,12 +22,12 @@ from random import randint
 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

src/Products/ExternalMethod/ExternalMethod.py

@@ -22,6 +22,7 @@ import stat
 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.Role import RoleManager
 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

src/Products/Five/browser/metaconfigure.py

@@ -37,11 +37,11 @@ from zope.browserpage.metaconfigure import providesCallable
 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

src/Products/Five/tests/testing/fancycontent.py

@@ -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

src/Products/Five/tests/testing/simplecontent.py

@@ -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

src/Products/Five/viewlet/metaconfigure.py

@@ -25,9 +25,9 @@ from zope.browser.interfaces import IBrowserView
 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

src/Products/MailHost/MailHost.py

@@ -36,12 +36,12 @@ import uu
 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

src/Products/OFSP/Draft.py

@@ -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
 

src/Products/OFSP/Version.py

@@ -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

src/Products/PageTemplates/PageTemplateFile.py

@@ -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 @@ class PageTemplateFile(SimpleItem, Script, PageTemplate, Traversable):
     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'}

src/Products/PageTemplates/ZopePageTemplate.py

@@ -17,6 +17,7 @@ $Id$
 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 AccessControl.ZopeGuards import safe_builtins
 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

src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py

@@ -18,10 +18,10 @@ $Id$
 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

src/Products/PythonScripts/PythonScript.py

@@ -27,13 +27,13 @@ import sys
 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

src/Products/PythonScripts/help/ModuleAccess.stx

@@ -21,7 +21,7 @@ Allowing Import of Modules
 
       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'.

src/Products/Sessions/BrowserIdManager.py

@@ -22,13 +22,13 @@ from urllib import quote
 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

src/Products/Sessions/SessionDataManager.py

@@ -14,11 +14,11 @@ from logging import getLogger
 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

src/Products/SiteAccess/VirtualHostMonster.py

@@ -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

src/Products/SiteErrorLog/SiteErrorLog.py

@@ -23,11 +23,11 @@ import logging
 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

src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py

@@ -25,10 +25,10 @@ import time
 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

src/Products/StandardCacheManagers/RAMCacheManager.py

@@ -20,9 +20,9 @@ from cgi import escape
 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

src/Products/Transience/Transience.py

@@ -24,12 +24,12 @@ import sys
 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

src/Products/Transience/TransientObject.py

@@ -24,9 +24,9 @@ import sys
 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

src/Products/ZCTextIndex/ZCTextIndex.py

@@ -18,6 +18,7 @@ $Id$
 
 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_base
 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

src/Products/ZCatalog/ZCatalog.py

@@ -22,13 +22,13 @@ import time
 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

src/Products/ZCatalog/ZCatalogIndexes.py

@@ -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

src/Products/ZODBMountPoint/MountedObject.py

@@ -24,12 +24,12 @@ from logging import getLogger
 
 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

src/Products/ZReST/ZReST.py

@@ -14,10 +14,10 @@ from docutils.writers.html4css1 import HTMLTranslator
 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

src/Products/ZSQLMethods/SQL.py

@@ -16,9 +16,9 @@ __doc__='''SQL Methods
 $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
 

src/Shared/DC/Scripts/Bindings.py

@@ -16,6 +16,7 @@ __version__='$Revision$'[11:-2]
 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.PermissionRole import _what_not_even_god_should_do
 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',

src/Shared/DC/Scripts/BindingsUI.py

@@ -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
 

src/Shared/DC/Scripts/Script.py

@@ -20,9 +20,9 @@ __version__='$Revision$'[11:-2]
 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

src/Shared/DC/ZRDB/Connection.py

@@ -21,6 +21,7 @@ from logging import getLogger
 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.Permissions import open_close_database_connection
 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

src/Shared/DC/ZRDB/DA.py

@@ -19,6 +19,7 @@ import string
 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.Role import RoleManager
 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

src/Testing/ZopeTestCase/ZopeLite.py

@@ -169,7 +169,7 @@ def installProduct(name, quiet=0):
 
 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):

src/webdav/Collection.py

@@ -17,8 +17,8 @@ $Id$
 
 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

src/webdav/Lockable.py

@@ -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
 

src/webdav/NullResource.py

@@ -17,6 +17,7 @@ $Id$
 
 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 AccessControl.Permissions import webdav_unlock_items
 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

src/webdav/Resource.py

@@ -23,6 +23,7 @@ from urllib import unquote
 
 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 AccessControl.Permissions import webdav_access
 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