[Zope-Checkins] SVN: Zope/branches/tseaver-no_globals_imports/lib/python/ Use 'InitializeClass' alias for 'default__class_init__'.
Tres Seaver
tseaver at palladion.com
Mon Dec 29 15:09:30 EST 2008
Log message for revision 94434:
Use 'InitializeClass' alias for 'default__class_init__'.
Changed:
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Owned.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Permission.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/PermissionMapping.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Role.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/SecurityInfo.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/User.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/securitySuite/regressionSecurity.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testAcquisition.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testBindings.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testClassSecurityInfo.py
U Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testZopeGuards.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/ApplicationManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/CacheManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/DavLockManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/Factory.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/FactoryDispatcher.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/ImageFile.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/Management.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/Permission.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/Product.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/Undo.py
U Zope/branches/tseaver-no_globals_imports/lib/python/App/tests/test_class_init.py
U Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/APIHelpTopic.py
U Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpSys.py
U Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpTopic.py
U Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/ObjectRef.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Application.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Cache.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/CopySupport.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLDocument.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLMethod.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/FindSupport.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Folder.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/History.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Image.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ObjectManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/OrderSupport.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertyManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertySheets.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/SimpleItem.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Traversable.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ZDOM.py
U Zope/branches/tseaver-no_globals_imports/lib/python/OFS/misc_.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/BTreeFolder2/BTreeFolder2.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ExternalMethod/ExternalMethod.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/browser/metaconfigure.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/metaconfigure.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/objectwidget.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/tests/schemacontent.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/formlib/tests/content.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/metaconfigure.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/security.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/test_security.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/fancycontent.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/simplecontent.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/viewlet/metaconfigure.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/MailHost/MailHost.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Draft.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Version.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/PageTemplateFile.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/ZopePageTemplate.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/PythonScripts/PythonScript.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/BrowserIdManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/SessionDataManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteAccess/VirtualHostMonster.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteErrorLog/SiteErrorLog.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/RAMCacheManager.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/Transience.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/TransientObject.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCTextIndex/ZCTextIndex.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalog.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalogIndexes.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZODBMountPoint/MountedObject.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZReST/ZReST.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZSQLMethods/SQL.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Bindings.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/BindingsUI.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Script.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/Connection.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/DA.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Testing/ZopeTestCase/ZopeLite.py
U Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/Property.py
U Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClass.py
U Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClassOwner.py
U Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/App/startup.py
U Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Collection.py
U Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Lockable.py
U Zope/branches/tseaver-no_globals_imports/lib/python/webdav/NullResource.py
U Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Resource.py
-=-
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Owned.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Owned.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Owned.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Permission.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Permission.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Permission.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -15,7 +15,7 @@
$Id$
"""
-import string, Products, Globals
+import string
from Acquisition import aq_base
@@ -122,6 +122,7 @@
"""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:
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/PermissionMapping.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/PermissionMapping.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/PermissionMapping.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Role.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Role.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/Role.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -23,7 +23,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/SecurityInfo.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/SecurityInfo.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/SecurityInfo.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -311,5 +311,5 @@
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)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/User.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/User.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/User.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -24,7 +24,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/securitySuite/regressionSecurity.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/securitySuite/regressionSecurity.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/securitySuite/regressionSecurity.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -23,7 +23,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testAcquisition.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testAcquisition.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testAcquisition.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -25,7 +25,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testBindings.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testBindings.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testBindings.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testClassSecurityInfo.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testClassSecurityInfo.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testClassSecurityInfo.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -28,7 +28,7 @@
# 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 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testZopeGuards.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testZopeGuards.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/AccessControl/tests/testZopeGuards.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -585,7 +585,7 @@
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:
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/ApplicationManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/ApplicationManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/ApplicationManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -25,7 +25,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/CacheManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/CacheManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/CacheManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -19,7 +19,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/DavLockManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/DavLockManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/DavLockManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -17,7 +17,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/Factory.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/Factory.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/Factory.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/FactoryDispatcher.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/FactoryDispatcher.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/FactoryDispatcher.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/ImageFile.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/ImageFile.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/ImageFile.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,7 +20,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/Management.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/Management.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/Management.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -23,15 +23,15 @@
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 @@
InitializeClass(Tabs)
-class Navigation(ExtensionClass.Base):
+class Navigation(Base):
"""Basic navigation UI support"""
implements(INavigation)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/Permission.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/Permission.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/Permission.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,7 +20,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/Product.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/Product.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/Product.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -48,7 +48,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/Undo.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/Undo.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/Undo.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,17 +21,15 @@
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)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/App/tests/test_class_init.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/App/tests/test_class_init.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/App/tests/test_class_init.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/APIHelpTopic.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/APIHelpTopic.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/APIHelpTopic.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpSys.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpSys.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpSys.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -17,7 +17,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpTopic.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpTopic.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/HelpTopic.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -16,7 +16,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/ObjectRef.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/ObjectRef.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/HelpSys/ObjectRef.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Application.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Application.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Application.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -29,7 +29,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Cache.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Cache.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Cache.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -28,7 +28,7 @@
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__'
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/CopySupport.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/CopySupport.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/CopySupport.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -36,7 +36,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLDocument.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLDocument.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLDocument.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,7 +20,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLMethod.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLMethod.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/DTMLMethod.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,7 +20,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/FindSupport.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/FindSupport.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/FindSupport.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -23,7 +23,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Folder.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Folder.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Folder.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/History.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/History.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/History.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Image.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Image.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Image.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ObjectManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ObjectManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ObjectManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -35,7 +35,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/OrderSupport.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/OrderSupport.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/OrderSupport.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertyManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertyManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertyManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertySheets.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertySheets.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/PropertySheets.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -26,7 +26,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/SimpleItem.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/SimpleItem.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/SimpleItem.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -41,7 +41,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Traversable.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Traversable.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/Traversable.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ZDOM.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ZDOM.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/ZDOM.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -21,7 +21,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/OFS/misc_.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/OFS/misc_.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/OFS/misc_.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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_:
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/BTreeFolder2/BTreeFolder2.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/BTreeFolder2/BTreeFolder2.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/BTreeFolder2/BTreeFolder2.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ExternalMethod/ExternalMethod.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ExternalMethod/ExternalMethod.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ExternalMethod/ExternalMethod.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -29,7 +29,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/browser/metaconfigure.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/browser/metaconfigure.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/browser/metaconfigure.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -47,7 +47,7 @@
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 @@
# Protect the class
_context.action(
discriminator = ('five:initialize:class', new_class),
- callable = initializeClass,
+ callable = InitializeClass,
args = (new_class,)
)
@@ -320,7 +320,7 @@
)
_context.action(
discriminator = ('five:initialize:class', new_class),
- callable = initializeClass,
+ callable = InitializeClass,
args = (new_class,)
)
@@ -388,7 +388,7 @@
)
_context.action(
discriminator = ('five:initialize:class', new_class),
- callable = initializeClass,
+ callable = InitializeClass,
args = (new_class,)
)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/metaconfigure.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/metaconfigure.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/metaconfigure.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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 @@
# 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 @@
# BaseFormDirective, that means that zope.Public has been
# translated to the CheckerPublic object
protectClass(class_, permission)
- initializeClass(class_)
+ InitializeClass(class_)
class AddFormDirective(FiveFormDirective):
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/objectwidget.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/objectwidget.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/objectwidget.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,8 +20,8 @@
$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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/tests/schemacontent.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/tests/schemacontent.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/form/tests/schemacontent.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/formlib/tests/content.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/formlib/tests/content.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/formlib/tests/content.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/metaconfigure.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/metaconfigure.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/metaconfigure.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,8 @@
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 @@
def __call__(self):
return self.__context.action(
discriminator = None,
- callable = initializeClass,
+ callable = InitializeClass,
args = (self.__class,)
)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/security.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/security.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/security.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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 = {}
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/test_security.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/test_security.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/test_security.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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 @@
... '''
>>> 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:
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/fancycontent.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/fancycontent.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/fancycontent.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -17,7 +17,7 @@
"""
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/simplecontent.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/simplecontent.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/tests/testing/simplecontent.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/viewlet/metaconfigure.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/viewlet/metaconfigure.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Five/viewlet/metaconfigure.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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 @@
)
_context.action(
discriminator = ('five:initialize:class', new_class),
- callable = initializeClass,
+ callable = InitializeClass,
args = (new_class,)
)
@@ -191,6 +191,6 @@
)
_context.action(
discriminator = ('five:initialize:class', new_class),
- callable = initializeClass,
+ callable = InitializeClass,
args = (new_class,)
)
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/MailHost/MailHost.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/MailHost/MailHost.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/MailHost/MailHost.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -26,7 +26,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Draft.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Draft.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Draft.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Version.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Version.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/OFSP/Version.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -24,7 +24,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/PageTemplateFile.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/PageTemplateFile.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/PageTemplateFile.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -16,7 +16,7 @@
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 @@
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'}
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/ZopePageTemplate.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/ZopePageTemplate.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/PageTemplates/ZopePageTemplate.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/PluginIndexes/TextIndex/Vocabulary.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -20,7 +20,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/PythonScripts/PythonScript.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/PythonScripts/PythonScript.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/PythonScripts/PythonScript.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -33,7 +33,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/BrowserIdManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/BrowserIdManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/BrowserIdManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -31,7 +31,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/SessionDataManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/SessionDataManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Sessions/SessionDataManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteAccess/VirtualHostMonster.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteAccess/VirtualHostMonster.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteAccess/VirtualHostMonster.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -9,7 +9,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteErrorLog/SiteErrorLog.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteErrorLog/SiteErrorLog.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/SiteErrorLog/SiteErrorLog.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -27,7 +27,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -28,7 +28,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/RAMCacheManager.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/RAMCacheManager.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/StandardCacheManagers/RAMCacheManager.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/Transience.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/Transience.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/Transience.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -29,7 +29,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/TransientObject.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/TransientObject.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/Transience/TransientObject.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -26,7 +26,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCTextIndex/ZCTextIndex.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCTextIndex/ZCTextIndex.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCTextIndex/ZCTextIndex.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -25,7 +25,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalog.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalog.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -29,11 +29,12 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalogIndexes.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalogIndexes.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZCatalog/ZCatalogIndexes.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZODBMountPoint/MountedObject.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZODBMountPoint/MountedObject.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZODBMountPoint/MountedObject.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -24,7 +24,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZReST/ZReST.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZReST/ZReST.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZReST/ZReST.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -17,7 +17,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZSQLMethods/SQL.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZSQLMethods/SQL.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Products/ZSQLMethods/SQL.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Bindings.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Bindings.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Bindings.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -23,7 +23,7 @@
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',
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/BindingsUI.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/BindingsUI.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/BindingsUI.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -15,7 +15,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Script.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Script.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/Scripts/Script.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -22,7 +22,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/Connection.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/Connection.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/Connection.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -28,7 +28,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/DA.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/DA.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Shared/DC/ZRDB/DA.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -35,7 +35,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Testing/ZopeTestCase/ZopeLite.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Testing/ZopeTestCase/ZopeLite.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -166,7 +166,7 @@
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):
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/Property.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/Property.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/Property.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -19,7 +19,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClass.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClass.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClass.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -19,7 +19,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClassOwner.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClassOwner.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/ZClasses/ZClassOwner.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/App/startup.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/App/startup.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/Zope2/App/startup.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -63,10 +63,10 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Collection.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Collection.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Collection.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -18,7 +18,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Lockable.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Lockable.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Lockable.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -17,7 +17,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/webdav/NullResource.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/webdav/NullResource.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/webdav/NullResource.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -26,7 +26,7 @@
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
Modified: Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Resource.py
===================================================================
--- Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Resource.py 2008-12-29 20:06:47 UTC (rev 94433)
+++ Zope/branches/tseaver-no_globals_imports/lib/python/webdav/Resource.py 2008-12-29 20:09:29 UTC (rev 94434)
@@ -32,7 +32,7 @@
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
More information about the Zope-Checkins
mailing list