[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - import cleanup
Yvo Schubbe
y.2009 at wcm-solutions.de
Sat Jan 3 11:27:40 EST 2009
Log message for revision 94487:
- import cleanup
Changed:
U Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py
U Products.CMFCore/trunk/Products/CMFCore/ActionProviderBase.py
U Products.CMFCore/trunk/Products/CMFCore/ActionsTool.py
U Products.CMFCore/trunk/Products/CMFCore/CMFBTreeFolder.py
U Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py
U Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py
U Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py
U Products.CMFCore/trunk/Products/CMFCore/ContentTypeRegistry.py
U Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
U Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
U Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py
U Products.CMFCore/trunk/Products/CMFCore/DynamicType.py
U Products.CMFCore/trunk/Products/CMFCore/Expression.py
U Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
U Products.CMFCore/trunk/Products/CMFCore/FSFile.py
U Products.CMFCore/trunk/Products/CMFCore/FSImage.py
U Products.CMFCore/trunk/Products/CMFCore/FSObject.py
U Products.CMFCore/trunk/Products/CMFCore/FSPageTemplate.py
U Products.CMFCore/trunk/Products/CMFCore/FSPropertiesObject.py
U Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py
U Products.CMFCore/trunk/Products/CMFCore/FSReSTMethod.py
U Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py
U Products.CMFCore/trunk/Products/CMFCore/FSZSQLMethod.py
U Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py
U Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
U Products.CMFCore/trunk/Products/CMFCore/PortalContent.py
U Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py
U Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
U Products.CMFCore/trunk/Products/CMFCore/RegistrationTool.py
U Products.CMFCore/trunk/Products/CMFCore/Skinnable.py
U Products.CMFCore/trunk/Products/CMFCore/SkinsContainer.py
U Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py
U Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
U Products.CMFCore/trunk/Products/CMFCore/URLTool.py
U Products.CMFCore/trunk/Products/CMFCore/UndoTool.py
U Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py
U Products.CMFCore/trunk/Products/CMFCore/permissions.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_SkinsTool.py
U Products.CMFCore/trunk/Products/CMFCore/utils.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/ActionInformation.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,7 +19,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base, aq_inner, aq_parent
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from OFS.ObjectManager import IFAwareObjectManager
from OFS.OrderedFolder import OrderedFolder
from OFS.PropertyManager import PropertyManager
Modified: Products.CMFCore/trunk/Products/CMFCore/ActionProviderBase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ActionProviderBase.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/ActionProviderBase.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,7 +18,7 @@
from warnings import warn
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 zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/ActionsTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ActionsTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/ActionsTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,7 +18,7 @@
from warnings import warn
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 IFAwareObjectManager
from OFS.OrderedFolder import OrderedFolder
Modified: Products.CMFCore/trunk/Products/CMFCore/CMFBTreeFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CMFBTreeFolder.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/CMFBTreeFolder.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -17,7 +17,7 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
from zope.component.factory import Factory
Modified: Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/CMFCatalogAware.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,9 +19,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from ExtensionClass import Base
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
from zope.app.container.interfaces import IObjectAddedEvent
Modified: Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/CachingPolicyManager.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -16,10 +16,10 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import InitializeClass
from App.Common import rfc1123_date
+from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from OFS.Cache import Cache
from OFS.Cache import CacheManager
from OFS.Cache import getVerifiedManagerIds
Modified: Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/CatalogTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,9 +19,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from Products.PluginIndexes.common import safe_callable
from Products.ZCatalog.ZCatalog import ZCatalog
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/ContentTypeRegistry.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/ContentTypeRegistry.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/ContentTypeRegistry.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -20,7 +20,7 @@
import urllib
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.SimpleItem import SimpleItem
from Persistence import PersistentMapping
Modified: Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,18 +18,18 @@
from base64 import encodestring, decodestring
from urllib import quote, unquote
+from AccessControl.Permissions import view_management_screens
from AccessControl.SecurityInfo import ClassSecurityInfo
-from AccessControl.Permissions import view_management_screens
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 HTMLFile
from DateTime.DateTime import DateTime
from OFS.Folder import Folder
from OFS.interfaces import IObjectWillBeMovedEvent
from zExceptions import Redirect
+from zope.app.container.interfaces import IObjectMovedEvent
from zope.interface import implements
-from zope.app.container.interfaces import IObjectMovedEvent
from ZPublisher import BeforeTraverse
from ZPublisher.HTTPRequest import HTTPRequest
Modified: Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -23,7 +23,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner, aq_parent
-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 HTMLFile
from OFS.Folder import Folder
Modified: Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/DiscussionTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,9 +19,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/DynamicType.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DynamicType.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/DynamicType.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -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 zope.app.publisher.browser import queryDefaultViewName
from zope.component import queryMultiAdapter
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/Expression.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/Expression.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/Expression.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,7 +19,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 Persistence import Persistent
from Products.PageTemplates.Expressions import getEngine
from Products.PageTemplates.Expressions import SecureModuleImporter
Modified: Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,10 +19,9 @@
from AccessControl.Role import RoleManager
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.special_dtml import DTMLFile
from App.special_dtml import HTML
-from OFS.Cache import Cacheable
from OFS.DTMLMethod import DTMLMethod, decapitate, guess_content_type
from Products.CMFCore.DirectoryView import registerFileExtension
Modified: Products.CMFCore/trunk/Products/CMFCore/FSFile.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSFile.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSFile.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,9 +18,8 @@
import codecs
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 Cacheable
from OFS.Image import File
from zope.contenttype import guess_content_type
Modified: Products.CMFCore/trunk/Products/CMFCore/FSImage.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSImage.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSImage.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -16,9 +16,8 @@
"""
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 Cacheable
from OFS.Image import getImageInfo
from OFS.Image import Image
Modified: Products.CMFCore/trunk/Products/CMFCore/FSObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -24,7 +24,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 HTML
from DateTime.DateTime import DateTime
from OFS.Cache import Cacheable
Modified: Products.CMFCore/trunk/Products/CMFCore/FSPageTemplate.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSPageTemplate.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSPageTemplate.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,9 +19,8 @@
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.special_dtml import DTMLFile
-from OFS.Cache import Cacheable
from Products.PageTemplates.PageTemplate import PageTemplate
from Products.PageTemplates.utils import encodingFromXMLPreamble
from Products.PageTemplates.utils import charsetFromMetaEquiv
Modified: Products.CMFCore/trunk/Products/CMFCore/FSPropertiesObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSPropertiesObject.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSPropertiesObject.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -17,18 +17,18 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import ImplicitAcquisitionWrapper
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
import Globals # for data
from OFS.Folder import Folder
from OFS.PropertyManager import PropertyManager
from ZPublisher.Converters import get_converter
-from DirectoryView import registerFileExtension
-from DirectoryView import registerMetaType
-from FSObject import FSObject
-from permissions import ViewManagementScreens
-from utils import _dtmldir
+from Products.CMFCore.DirectoryView import registerFileExtension
+from Products.CMFCore.DirectoryView import registerMetaType
+from Products.CMFCore.FSObject import FSObject
+from Products.CMFCore.permissions import ViewManagementScreens
+from Products.CMFCore.utils import _dtmldir
class FSPropertiesObject(FSObject, PropertyManager):
Modified: Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSPythonScript.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -20,10 +20,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
-from ComputedAttribute import ComputedAttribute
-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 Cacheable
+from ComputedAttribute import ComputedAttribute
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PythonScripts.PythonScript import PythonScript
from Shared.DC.Scripts.Script import Script
Modified: Products.CMFCore/trunk/Products/CMFCore/FSReSTMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSReSTMethod.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSReSTMethod.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -15,11 +15,12 @@
$Id$
"""
+
from docutils.core import publish_parts
from docutils.writers.html4css1 import Writer
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 Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.ZReST.ZReST import Warnings
Modified: Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -17,9 +17,9 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from DocumentTemplate.DT_HTML import HTML as DTML_HTML
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from OFS.DTMLDocument import DTMLDocument
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from zope.structuredtext import stx2html
Modified: Products.CMFCore/trunk/Products/CMFCore/FSZSQLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSZSQLMethod.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/FSZSQLMethod.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -19,7 +19,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import ImplicitAcquisitionWrapper
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
import Globals # for data
from Products.ZSQLMethods.SQL import SQL
Modified: Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/MemberDataTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -17,9 +17,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner, aq_parent, aq_base
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from BTrees.OOBTree import OOBTree
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
from OFS.PropertyManager import PropertyManager
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -14,6 +14,7 @@
$Id$
"""
+
import logging
from warnings import warn
@@ -23,7 +24,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 DTMLFile
from OFS.Folder import Folder
Modified: Products.CMFCore/trunk/Products/CMFCore/PortalContent.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalContent.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalContent.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -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 OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -23,7 +23,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_parent, aq_inner, aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from OFS.Folder import Folder
from OFS.OrderSupport import OrderSupport
from zope.component.factory import Factory
Modified: Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalObject.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalObject.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -15,7 +15,7 @@
$Id$
"""
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from five.localsitemanager.registry import PersistentComponents
from Products.Five.component.interfaces import IObjectManagerSite
from zope.app.publication.zopepublication import BeforeTraverseEvent
Modified: Products.CMFCore/trunk/Products/CMFCore/RegistrationTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/RegistrationTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/RegistrationTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -20,7 +20,7 @@
from AccessControl.requestmethod import postonly
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.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/Skinnable.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/Skinnable.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/Skinnable.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -24,7 +24,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 OFS.ObjectManager import ObjectManager
from ZODB.POSException import ConflictError
Modified: Products.CMFCore/trunk/Products/CMFCore/SkinsContainer.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/SkinsContainer.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/SkinsContainer.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -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 zope.interface import implements
from Products.CMFCore.exceptions import SkinPathError
Modified: Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/SkinsTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -14,17 +14,18 @@
$Id$
"""
+
from difflib import unified_diff
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
-from App.special_dtml import DTMLFile
-import Globals # for data
from OFS.DTMLMethod import DTMLMethod
from OFS.Folder import Folder
from OFS.Image import Image
+from OFS.ObjectManager import REPLACEABLE
from Persistence import PersistentMapping
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PythonScripts.PythonScript import PythonScript
@@ -221,7 +222,7 @@
return None
# Make the PUT_factory replaceable
- PUT_factory__replaceable__ = Globals.REPLACEABLE
+ PUT_factory__replaceable__ = REPLACEABLE
security.declarePrivate('testSkinPath')
Modified: Products.CMFCore/trunk/Products/CMFCore/TypesTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/TypesTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/TypesTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -22,7 +22,7 @@
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
from Acquisition import aq_get
-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: Products.CMFCore/trunk/Products/CMFCore/URLTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/URLTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/URLTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,7 +18,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
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
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/UndoTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/UndoTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/UndoTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -16,7 +16,7 @@
"""
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.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/WorkflowTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -21,7 +21,7 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.requestmethod import postonly
from Acquisition import aq_base, aq_inner, aq_parent
-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: Products.CMFCore/trunk/Products/CMFCore/permissions.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/permissions.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/permissions.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -17,9 +17,9 @@
from AccessControl import Permissions
from AccessControl.Permission import _registeredPermissions
+from AccessControl.Permission import ApplicationDefaultPermissions
from AccessControl.Permission import pname
from AccessControl.SecurityInfo import ModuleSecurityInfo
-from App.class_init import ApplicationDefaultPermissions
security = ModuleSecurityInfo('Products.CMFCore.permissions')
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -22,7 +22,6 @@
from Acquisition import Implicit
from Products.Five.browser import BrowserView
-from zope.component import getSiteManager
from zope.component import provideAdapter
from zope.component.interfaces import IDefaultViewName
from zope.interface import alsoProvides
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_SkinsTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_SkinsTool.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_SkinsTool.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -18,7 +18,6 @@
import unittest
import Testing
-from zope.component import getSiteManager
from zope.interface.verify import verifyClass
from zope.testing.cleanup import cleanUp
Modified: Products.CMFCore/trunk/Products/CMFCore/utils.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/utils.py 2009-01-03 16:26:45 UTC (rev 94486)
+++ Products.CMFCore/trunk/Products/CMFCore/utils.py 2009-01-03 16:27:40 UTC (rev 94487)
@@ -33,7 +33,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.Common import package_home
from App.Dialogs import MessageDialog
from App.ImageFile import ImageFile
@@ -42,6 +42,7 @@
from ExtensionClass import Base
from OFS.misc_ import misc_ as misc_images
from OFS.misc_ import Misc_ as MiscImage
+from OFS.ObjectManager import UNIQUE
from OFS.PropertyManager import PropertyManager
from OFS.PropertySheets import PropertySheets
from OFS.SimpleItem import SimpleItem
@@ -505,8 +506,7 @@
""" Base class for objects which cannot be "overridden" / shadowed.
"""
def _getUNIQUE(self):
- import Globals # for data
- return Globals.UNIQUE
+ return UNIQUE
__replaceable__ = property(_getUNIQUE,)
More information about the Checkins
mailing list