Use 'InitializeClass' alias for 'default__class_init__'.

lib/python/AccessControl/Owned.py

@@ -21,7 +21,7 @@ from Acquisition import aq_get
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from App.special_dtml import DTMLFile
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from ExtensionClass import Base
 from zope.interface import implements
 

lib/python/AccessControl/Permission.py

@@ -15,7 +15,7 @@
 $Id$
 """
 
-import string, Products, Globals
+import string
 
 from Acquisition import aq_base
 
@@ -122,6 +122,7 @@ def registerPermissions(permissions, defaultDefault=('Manager',)):
     """Register an __ac_permissions__ sequence.
     """
     from App.class_init import ApplicationDefaultPermissions
+    import Products
     for setting in permissions:
         if _registerdPermission(setting[0]): continue
         if len(setting)==2:

lib/python/AccessControl/PermissionMapping.py

@@ -22,7 +22,7 @@ $Id$
 from cgi import escape
 
 from Acquisition import ImplicitAcquisitionWrapper
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from ExtensionClass import Base
 from zope.interface import implements
 

lib/python/AccessControl/Role.py

@@ -23,7 +23,7 @@ from Acquisition import Implicit
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.Permissions import change_permissions
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from ExtensionClass import Base

lib/python/AccessControl/SecurityInfo.py

@@ -311,5 +311,5 @@ def allow_class(Class):
     sec.declareObjectPublic()
     sec.setDefaultAccess(1)
     sec.apply(Class)
-    from App.class_init import default__class_init__ as InitializeClass
+    from App.class_init import InitializeClass
     InitializeClass(Class)

lib/python/AccessControl/User.py

@@ -24,7 +24,7 @@ from Acquisition import aq_base
 from Acquisition import aq_parent
 from Acquisition import aq_inContextOf
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Management import Navigation
 from App.Management import Tabs
 from App.special_dtml import DTMLFile

lib/python/AccessControl/securitySuite/regressionSecurity.py

@@ -23,7 +23,7 @@ from AccessControl.User import nobody
 from AccessControl.securitySuite import SecurityBase
 from OFS.Folder import Folder
 from OFS.SimpleItem  import SimpleItem
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 
 
 # let's define some permissions first

lib/python/AccessControl/tests/testAcquisition.py

@@ -25,7 +25,7 @@ import Zope2
 Zope2.startup()
 
 from OFS.SimpleItem import SimpleItem
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager

lib/python/AccessControl/tests/testBindings.py

@@ -21,7 +21,7 @@ import ZODB
 import transaction
 from Acquisition import Implicit
 from AccessControl import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.ObjectManager import ObjectManager
 from OFS.Folder import Folder
 

lib/python/AccessControl/tests/testClassSecurityInfo.py

@@ -28,7 +28,7 @@ class ClassSecurityInfoTests(unittest.TestCase):
 
         # Test setting default roles for permissions.
 
-        from App.class_init import default__class_init__
+        from App.class_init import InitializeClass
         from ExtensionClass import Base
 
         ClassSecurityInfo = self._getTargetClass()
@@ -56,7 +56,7 @@ class ClassSecurityInfoTests(unittest.TestCase):
                 pass
 
         # Do class initialization.
-        default__class_init__(Test)
+        InitializeClass(Test)
 
         # Now check the resulting class to see if the mapping was made
         # correctly. Note that this uses carnal knowledge of the internal

lib/python/AccessControl/tests/testZopeGuards.py

@@ -585,7 +585,7 @@ class TestActualPython(GuardTestCase):
 
         from AccessControl.SecurityInfo import ClassSecurityInfo
         from ExtensionClass import Base
-        from App.class_init import default__class_init__ as InitializeClass
+        from App.class_init import InitializeClass
 
         global _ProtectedBase
         if _ProtectedBase is None:

lib/python/App/ApplicationManager.py

@@ -25,7 +25,7 @@ from AccessControl.requestmethod import requestmethod
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import Implicit
 from App.CacheManager import CacheManager
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.config import getConfiguration
 from App.DavLockManager import DavLockManager
 from App.Dialogs import MessageDialog

lib/python/App/CacheManager.py

@@ -19,7 +19,7 @@ __version__='$Revision: 1.31 $'[11:-2]
 
 import time
 
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from App.ImageFile import ImageFile
 from DateTime.DateTime import DateTime

lib/python/App/DavLockManager.py

@@ -17,7 +17,7 @@ from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import aq_base
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.SimpleItem import Item
 from webdav.Lockable import wl_isLocked

lib/python/App/Factory.py

@@ -21,7 +21,7 @@ from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Acquired
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Persistence import Persistent
 from OFS.SimpleItem import Item

lib/python/App/FactoryDispatcher.py

@@ -22,7 +22,7 @@ from AccessControl.Owned import UnownableOwner
 from Acquisition import Acquired
 from Acquisition import aq_base
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 
 def _product_packages():
     """Returns all product packages including the regularly defined

lib/python/App/ImageFile.py

@@ -20,7 +20,7 @@ import time
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Explicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import package_home
 from App.Common import rfc1123_date
 from App.config import getConfiguration

lib/python/App/Management.py

@@ -23,15 +23,15 @@ from zope.interface import implements
 from AccessControl import getSecurityManager, Unauthorized
 from AccessControl import ClassSecurityInfo
 from AccessControl.Permissions import view_management_screens
-import ExtensionClass
-from zExceptions import Redirect
-
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.interfaces import INavigation
 from App.special_dtml import HTMLFile
 from App.special_dtml import DTMLFile
+from ExtensionClass import Base
+from zExceptions import Redirect
+
 
-class Tabs(ExtensionClass.Base):
+class Tabs(Base):
     """Mix-in provides management folder tab support."""
 
     security = ClassSecurityInfo()
@@ -161,7 +161,7 @@ class Tabs(ExtensionClass.Base):
 InitializeClass(Tabs)
 
 
-class Navigation(ExtensionClass.Base):
+class Navigation(Base):
     """Basic navigation UI support"""
 
     implements(INavigation)

lib/python/App/Permission.py

@@ -20,7 +20,7 @@ from AccessControl.Permissions import define_permissions
 from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from ExtensionClass import Base
 from OFS.SimpleItem import Item

lib/python/App/Product.py

@@ -48,7 +48,7 @@ from AccessControl.Owned import UnownableOwner
 from AccessControl.Permissions import manage_zclasses
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.unauthorized import Unauthorized
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.Folder import Folder
 

lib/python/App/Undo.py

@@ -21,17 +21,15 @@ from Acquisition import aq_parent
 from AccessControl import getSecurityManager
 from AccessControl import ClassSecurityInfo
 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
 import ExtensionClass
 import transaction
 from ZopeUndo.Prefix import Prefix
 from zope.interface import implements
 
-from App.class_init import default__class_init__ as InitializeClass
-from App.interfaces import IUndoSupport
-from App.special_dtml import DTMLFile
-
-
 class UndoSupport(ExtensionClass.Base):
 
     implements(IUndoSupport)

lib/python/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 default__class_init__ as InitializeClass
+    >>> from App.class_init import InitializeClass
     >>> class AnotherClass(ExtensionClass.Base):
     ...     _need__name__ = 1
 

lib/python/HelpSys/APIHelpTopic.py

@@ -18,7 +18,7 @@ $Id$
 import types
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Persistence import Persistent
 

lib/python/HelpSys/HelpSys.py

@@ -17,7 +17,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTML
 from OFS.ObjectManager import ObjectManager

lib/python/HelpSys/HelpTopic.py

@@ -16,7 +16,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.ImageFile import ImageFile
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTML

lib/python/HelpSys/ObjectRef.py

@@ -18,7 +18,7 @@ import sys
 from urllib import quote
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from HelpSys.HelpUtil import classobject
 from HelpSys.HelpUtil import HelpBase

lib/python/OFS/Application.py

@@ -29,7 +29,7 @@ from AccessControl import ClassSecurityInfo
 from AccessControl.User import UserFolder
 from Acquisition import aq_base
 from App.ApplicationManager import ApplicationManager
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.class_init import ApplicationDefaultPermissions
 from App.config import getConfiguration
 from App.Product import doInstall

lib/python/OFS/Cache.py

@@ -28,7 +28,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 
 ZCM_MANAGERS = '__ZCacheManager_ids__'

lib/python/OFS/CopySupport.py

@@ -36,7 +36,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import HTML
 from App.special_dtml import HTMLFile

lib/python/OFS/DTMLDocument.py

@@ -20,7 +20,7 @@ from urllib import quote
 from AccessControl import getSecurityManager
 from AccessControl.Permissions import change_dtml_methods
 from AccessControl.Permissions import change_dtml_documents
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTML

lib/python/OFS/DTMLMethod.py

@@ -20,7 +20,7 @@ from urllib import quote
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.Role import RoleManager
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTML

lib/python/OFS/FindSupport.py

@@ -23,7 +23,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from DateTime.DateTime import DateTime
 from DocumentTemplate.DT_Util import Eval
 from DocumentTemplate.DT_Util import InstanceDict

lib/python/OFS/Folder.py

@@ -22,7 +22,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from webdav.Collection import Collection
 from zope.interface import implements

lib/python/OFS/History.py

@@ -22,7 +22,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from ExtensionClass import Base

lib/python/OFS/Image.py

@@ -27,7 +27,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from Persistence import Persistent

lib/python/OFS/ObjectManager.py

@@ -35,7 +35,7 @@ from AccessControl import getSecurityManager
 from AccessControl.ZopeSecurityPolicy import getRoles
 from Acquisition import aq_base
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import is_acquired
 from App.config import getConfiguration
 from App.Dialogs import MessageDialog

lib/python/OFS/OrderSupport.py

@@ -21,7 +21,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from DocumentTemplate.sequence import sort
 from zope.interface import implements
 from zope.app.container.contained import notifyContainerModified

lib/python/OFS/PropertyManager.py

@@ -21,7 +21,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from ExtensionClass import Base
 from App.special_dtml import DTMLFile
 from App.Dialogs import MessageDialog

lib/python/OFS/PropertySheets.py

@@ -26,7 +26,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import iso8601_date
 from App.Common import rfc1123_date
 from App.Dialogs import MessageDialog

lib/python/OFS/SimpleItem.py

@@ -41,7 +41,7 @@ from Acquisition import aq_inner
 from Acquisition import aq_parent
 from Acquisition import Implicit
 from App.Management import Tabs
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import HTML
 from App.special_dtml import DTMLFile
 from App.Undo import UndoSupport

lib/python/OFS/Traversable.py

@@ -27,7 +27,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.interfaces import ITraversable
 from zExceptions import NotFound
 from ZODB.POSException import ConflictError

lib/python/OFS/ZDOM.py

@@ -21,7 +21,7 @@ from Acquisition import Explicit
 from Acquisition import Implicit
 from Acquisition import aq_base
 from Acquisition import aq_parent
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 
 
 # Node type codes

lib/python/OFS/misc_.py

@@ -12,7 +12,7 @@
 ##############################################################################
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.ImageFile import ImageFile
 
 class misc_:

lib/python/Products/BTreeFolder2/BTreeFolder2.py

@@ -27,7 +27,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from BTrees.Length import Length
 from BTrees.OIBTree import OIBTree

lib/python/Products/ExternalMethod/ExternalMethod.py

@@ -29,7 +29,7 @@ from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Acquired
 from Acquisition import Explicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.Extensions import getObject
 from App.Extensions import getPath

lib/python/Products/Five/browser/metaconfigure.py

@@ -47,7 +47,7 @@ from Products.Five.security import protectClass
 from Products.Five.security import protectName
 from Products.Five.security import CheckerPrivateId
 
-from App.class_init import default__class_init__ as initializeClass
+from App.class_init import InitializeClass
 
 def page(_context, name, permission, for_,
          layer=IDefaultBrowserLayer, template=None, class_=None,
@@ -158,7 +158,7 @@ def page(_context, name, permission, for_,
     # Protect the class
     _context.action(
         discriminator = ('five:initialize:class', new_class),
-        callable = initializeClass,
+        callable = InitializeClass,
         args = (new_class,)
         )
 
@@ -320,7 +320,7 @@ def resource(_context, name, layer=IDefaultBrowserLayer, permission='zope.Public
         )
     _context.action(
         discriminator = ('five:initialize:class', new_class),
-        callable = initializeClass,
+        callable = InitializeClass,
         args = (new_class,)
         )
 
@@ -388,7 +388,7 @@ def resourceDirectory(_context, name, directory, layer=IDefaultBrowserLayer,
             )
         _context.action(
             discriminator = ('five:initialize:class', new_class),
-            callable = initializeClass,
+            callable = InitializeClass,
             args = (new_class,)
             )
 

lib/python/Products/Five/form/metaconfigure.py

@@ -15,7 +15,7 @@
 
 $Id$
 """
-from App.class_init import default__class_init__ as initializeClass
+from App.class_init import InitializeClass
 from ExtensionClass import Base
 
 import zope.component
@@ -60,7 +60,7 @@ def EditViewFactory(name, schema, label, permission, layer,
     # BaseFormDirective, that means that zope.Public has been
     # translated to the CheckerPublic object
     protectClass(class_, permission)
-    initializeClass(class_)
+    InitializeClass(class_)
 
 class FiveFormDirective(BaseFormDirective):
 
@@ -123,7 +123,7 @@ def AddViewFactory(name, schema, label, permission, layer,
     # BaseFormDirective, that means that zope.Public has been
     # translated to the CheckerPublic object
     protectClass(class_, permission)
-    initializeClass(class_)
+    InitializeClass(class_)
 
 class AddFormDirective(FiveFormDirective):
 

lib/python/Products/Five/form/objectwidget.py

@@ -20,8 +20,8 @@ the widget's sub-editform.
 
 $Id$
 """
-from AccessControl import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import InitializeClass
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope.app.form.browser.objectwidget import ObjectWidget as OWBase
 from zope.app.form.browser.objectwidget import ObjectWidgetView as OWVBase

lib/python/Products/Five/form/tests/schemacontent.py

@@ -15,7 +15,7 @@
 
 $Id$
 """
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 from Products.Five.form.objectwidget import ObjectWidget
 

lib/python/Products/Five/formlib/tests/content.py

@@ -15,7 +15,7 @@
 
 $Id$
 """
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
 from zope.i18nmessageid import MessageFactory

lib/python/Products/Five/metaconfigure.py

@@ -18,7 +18,8 @@ $Id$
 import warnings
 from zope.configuration.exceptions import ConfigurationError
 from zope.app.component import contentdirective
-from Products.Five.security import protectName, initializeClass
+from App.class_init import InitializeClass
+from Products.Five.security import protectName
 
 class ClassDirective(contentdirective.ClassDirective):
 
@@ -41,6 +42,6 @@ class ClassDirective(contentdirective.ClassDirective):
     def __call__(self):
         return self.__context.action(
             discriminator = None,
-            callable = initializeClass,
+            callable = InitializeClass,
             args = (self.__class,)
             )

lib/python/Products/Five/security.py

@@ -15,19 +15,22 @@
 
 $Id$
 """
-from zope.component import queryUtility, getUtility
-from zope.interface import implements, classProvides
-from zope.security.interfaces import IInteraction, ISecurityPolicy
+from zope.component import getUtility
+from zope.component import queryUtility
+from zope.interface import classProvides
+from zope.interface import implements
+from zope.security.checker import CheckerPublic
+from zope.security.interfaces import IInteraction
+from zope.security.interfaces import ISecurityPolicy
 from zope.security.interfaces import IPermission
 from zope.security.management import thread_local
 from zope.security.simplepolicies import ParanoidSecurityPolicy
 
-from AccessControl import ClassSecurityInfo, getSecurityManager
-from App.class_init import default__class_init__ as initializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
 
 CheckerPublicId = 'zope.Public'
 CheckerPrivateId = 'zope2.Private'
-from zope.security.checker import CheckerPublic
 
 def getSecurityInfo(klass):
     sec = {}

lib/python/Products/Five/tests/test_security.py

@@ -16,8 +16,9 @@
 $Id$
 """
 
-from zope.interface import Interface, implements
-from AccessControl import ClassSecurityInfo
+from zope.interface import implements
+from zope.interface import Interface
+from AccessControl.SecurityInfo import ClassSecurityInfo
 
 class ISuperDummy(Interface):
     """
@@ -95,7 +96,7 @@ def test_security_equivalence():
       ... '''
       >>> zcml.load_string(configure_zcml)
 
-      >>> from App.class_init import default__class_init__ as InitializeClass
+      >>> from App.class_init import InitializeClass
       >>> InitializeClass(Dummy2)
 
     Now we compare their access controls:

lib/python/Products/Five/tests/testing/fancycontent.py

@@ -17,7 +17,7 @@ $Id$
 """
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Explicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
 from zope.interface import implements

lib/python/Products/Five/tests/testing/simplecontent.py

@@ -16,7 +16,7 @@
 $Id$
 """
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
 from zope.interface import implements

lib/python/Products/Five/viewlet/metaconfigure.py

@@ -27,7 +27,7 @@ from zope.publisher.interfaces.browser import IBrowserView
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.viewlet import interfaces
 
-from App.class_init import default__class_init__ as initializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Products.Five.security import protectClass
 from Products.Five.security import protectName
@@ -91,7 +91,7 @@ def viewletManagerDirective(
                 )
     _context.action(
         discriminator = ('five:initialize:class', new_class),
-        callable = initializeClass,
+        callable = InitializeClass,
         args = (new_class,)
         )
 
@@ -191,6 +191,6 @@ def viewletDirective(
                 )
     _context.action(
         discriminator = ('five:initialize:class', new_class),
-        callable = initializeClass,
+        callable = InitializeClass,
         args = (new_class,)
         )

lib/python/Products/MailHost/MailHost.py

@@ -26,7 +26,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
 from Persistence import Persistent

lib/python/Products/OFSP/Draft.py

@@ -13,7 +13,7 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.User import UserFolder
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import HTMLFile
 from Acquisition import Implicit
 from OFS.SimpleItem import Item

lib/python/Products/OFSP/Version.py

@@ -24,7 +24,7 @@ from AccessControl.Permissions import view_management_screens
 from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTML

lib/python/Products/PageTemplates/PageTemplateFile.py

@@ -16,7 +16,7 @@ from logging import getLogger
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
-from App.class_init import default__class_init__ as InitializeClass
+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.default__class_init__
+    # needed by App.class_init.InitializeClass
     _need__name__ = 1
 
     _default_bindings = {'name_subpath': 'traverse_subpath'}

lib/python/Products/PageTemplates/ZopePageTemplate.py

@@ -27,7 +27,7 @@ from AccessControl.ZopeGuards import safe_builtins
 from Acquisition import Acquired
 from Acquisition import Explicit
 from Acquisition import aq_get
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import package_home
 from App.ImageFile import ImageFile
 from DateTime.DateTime import DateTime

lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py

@@ -18,7 +18,7 @@ $Id$
 import os
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import package_home
 from App.special_dtml import DTMLFile
 from BTrees.IIBTree import IISet

lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py

@@ -20,7 +20,7 @@ from AccessControl.Permissions import query_vocabulary
 from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from Persistence import Persistent

lib/python/Products/PythonScripts/PythonScript.py

@@ -33,7 +33,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Common import package_home
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile

lib/python/Products/Sessions/BrowserIdManager.py

@@ -31,7 +31,7 @@ from Acquisition import Implicit
 from Acquisition import aq_base
 from Acquisition import aq_parent
 from Acquisition import aq_inner
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.Management import Tabs
 from App.special_dtml import DTMLFile

lib/python/Products/Sessions/SessionDataManager.py

@@ -22,7 +22,7 @@ from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
 from Acquisition import Explicit
 from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from App.Management import Tabs
 from OFS.SimpleItem import Item

lib/python/Products/SiteAccess/VirtualHostMonster.py

@@ -9,7 +9,7 @@ from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from OFS.SimpleItem import Item

lib/python/Products/SiteErrorLog/SiteErrorLog.py

@@ -27,7 +27,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from OFS.SimpleItem import SimpleItem
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile

lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py

@@ -28,7 +28,7 @@ import urlparse
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from App.Common import rfc1123_date
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.Cache import Cache
 from OFS.Cache import CacheManager

lib/python/Products/StandardCacheManagers/RAMCacheManager.py

@@ -22,7 +22,7 @@ import time
 
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.Cache import Cache
 from OFS.Cache import CacheManager

lib/python/Products/Transience/Transience.py

@@ -29,7 +29,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import HTMLFile
 from BTrees.Length import Length as BTreesLength
 from BTrees.OOBTree import OOBTree

lib/python/Products/Transience/TransientObject.py

@@ -26,7 +26,7 @@ import time
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from Persistence import Persistent
 from ZODB.POSException import ConflictError
 from zope.interface import implements

lib/python/Products/ZCTextIndex/ZCTextIndex.py

@@ -25,7 +25,7 @@ from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.SimpleItem import SimpleItem
 from Persistence import Persistent

lib/python/Products/ZCatalog/ZCatalog.py

@@ -29,11 +29,12 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
-from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
+from DocumentTemplate.DT_Util import InstanceDict
+from DocumentTemplate.DT_Util import TemplateDict
 from DocumentTemplate.DT_Util import Eval
 from OFS.Folder import Folder
 from OFS.ObjectManager import ObjectManager

lib/python/Products/ZCatalog/ZCatalogIndexes.py

@@ -18,7 +18,7 @@ $Id$
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.Permissions import manage_zcatalog_indexes
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.Folder import Folder
 from OFS.ObjectManager import IFAwareObjectManager

lib/python/Products/ZODBMountPoint/MountedObject.py

@@ -24,7 +24,7 @@ from logging import getLogger
 
 import transaction
 
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from Acquisition import ImplicitAcquisitionWrapper
 from Acquisition import aq_base
 from Acquisition import aq_inner

lib/python/Products/ZReST/ZReST.py

@@ -17,7 +17,7 @@ import sys
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityInfo import ModuleSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.config import getConfiguration 
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime

lib/python/Products/ZSQLMethods/SQL.py

@@ -18,7 +18,7 @@ __version__='$Revision: 1.21 $'[11:-2]
 
 from AccessControl.Permissions import change_database_methods
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Shared.DC.ZRDB.DA import DA
 

lib/python/Shared/DC/Scripts/Bindings.py

@@ -23,7 +23,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from Persistence import Persistent
 
 defaultBindings = {'name_context': 'context',

lib/python/Shared/DC/Scripts/BindingsUI.py

@@ -15,7 +15,7 @@ __version__='$Revision$'[11:-2]
 
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Shared.DC.Scripts.Bindings import Bindings
 

lib/python/Shared/DC/Scripts/Script.py

@@ -22,7 +22,7 @@ from urllib import quote
 
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from DocumentTemplate.DT_Util import TemplateDict
 from OFS.SimpleItem import SimpleItem

lib/python/Shared/DC/ZRDB/Connection.py

@@ -28,7 +28,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime

lib/python/Shared/DC/ZRDB/DA.py

@@ -35,7 +35,7 @@ from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from App.Extensions import getBrain
 from App.special_dtml import DTMLFile

lib/python/Testing/ZopeTestCase/ZopeLite.py

@@ -166,7 +166,7 @@ def installProduct(name, quiet=0):
 
 def _installProduct(name, quiet=0):
     '''Installs a Zope product.'''
-    from App.class_init import default__class_init__ as InitializeClass
+    from App.class_init import InitializeClass
     start = time.time()
     meta_types = []
     if _patched and not _installedProducts.has_key(name):

lib/python/ZClasses/Property.py

@@ -19,7 +19,7 @@ from AccessControl.Permissions import manage_zclasses
 from AccessControl.Permissions import manage_properties
 from AccessControl.Permissions import access_contents_information
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from OFS.ObjectManager import ObjectManager
 from OFS.PropertySheets import FixedSchema

lib/python/ZClasses/ZClass.py

@@ -19,7 +19,7 @@ from AccessControl.Permissions import create_class_instances
 from AccessControl.Role import gather_permissions
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.FactoryDispatcher import FactoryDispatcher
 from App.ImageFile import ImageFile
 from App.special_dtml import DTMLFile

lib/python/ZClasses/ZClassOwner.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Zope Classes
 """
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import HTMLFile
 from ExtensionClass import Base
 

lib/python/Zope2/App/startup.py

@@ -63,10 +63,10 @@ def stuff_Globals():
     Globals.Persistent = Persistent
     Globals.PersistentMapping = PersistentMapping
 
-    from App.class_init import default__class_init__
+    from App.class_init import InitializeClass
     from App.class_init import ApplicationDefaultPermissions
 
-    Globals.InitializeClass = default__class_init__
+    Globals.InitializeClass = InitializeClass
     Globals.ApplicationDefaultPermissions = ApplicationDefaultPermissions
 
     from App.special_dtml import HTML

lib/python/webdav/Collection.py

@@ -18,7 +18,7 @@ $Id$
 from urllib import unquote
 
 from AccessControl.SecurityManagement import getSecurityManager
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zExceptions import MethodNotAllowed
 from zExceptions import NotFound
 from zope.interface import implements

lib/python/webdav/Lockable.py

@@ -17,7 +17,7 @@ $Id$
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from Persistence import PersistentMapping
 from zope.interface import implements
 

lib/python/webdav/NullResource.py

@@ -26,7 +26,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
 from Persistence import Persistent
 from OFS.CopySupport import CopyError

lib/python/webdav/Resource.py

@@ -32,7 +32,7 @@ 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 default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from ExtensionClass import Base
 from OFS.event import ObjectClonedEvent
 from OFS.event import ObjectWillBeMovedEvent