[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - import cleanup
Yvo Schubbe
y.2009 at wcm-solutions.de
Sat Jan 3 11:28:03 EST 2009
Log message for revision 94488:
- import cleanup
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py
U Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py
U Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/Document.py
U Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py
U Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
U Products.CMFDefault/trunk/Products/CMFDefault/File.py
U Products.CMFDefault/trunk/Products/CMFDefault/Image.py
U Products.CMFDefault/trunk/Products/CMFDefault/Link.py
U Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py
U Products.CMFDefault/trunk/Products/CMFDefault/Portal.py
U Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py
U Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -19,8 +19,8 @@
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
+from App.class_init import InitializeClass
from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
from zope.interface import implements
from Products.CMFCore.interfaces import IWorkflowDefinition
@@ -28,7 +28,6 @@
from Products.CMFCore.utils import _modifyPermissionMappings
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import SimpleItemWithProperties
-
from Products.CMFDefault.exceptions import AccessControl_Unauthorized
from Products.CMFDefault.permissions import ModifyPortalContent
from Products.CMFDefault.permissions import RequestReview
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -20,8 +20,8 @@
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
+from App.class_init import InitializeClass
from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
from OFS.Traversable import Traversable
from Persistence import Persistent
from Persistence import PersistentMapping
@@ -32,7 +32,6 @@
from Products.CMFCore.interfaces import IDiscussable
from Products.CMFCore.interfaces import IDiscussionResponse
from Products.CMFCore.interfaces import IDiscussionTool
-
from Products.CMFDefault.Document import Document
from Products.CMFDefault.permissions import AccessContentsInformation
from Products.CMFDefault.permissions import ManagePortal
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -14,9 +14,10 @@
$Id$
"""
+
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from App.special_dtml import DTMLFile
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
@@ -27,7 +28,6 @@
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-
from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
from Products.CMFDefault.exceptions import AccessControl_Unauthorized
from Products.CMFDefault.exceptions import DiscussionNotAllowed
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -24,7 +24,7 @@
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
from App.config import getConfiguration
-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 html_quote
import transaction
@@ -37,8 +37,6 @@
from Products.CMFCore.PortalContent import PortalContent
from Products.CMFCore.utils import contributorsplitter
from Products.CMFCore.utils import keywordsplitter
-from Products.GenericSetup.interfaces import IDAVAware
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.exceptions import EditingConflict
from Products.CMFDefault.exceptions import ResourceLockedError
@@ -53,6 +51,7 @@
from Products.CMFDefault.utils import Message as _
from Products.CMFDefault.utils import parseHeadersBody
from Products.CMFDefault.utils import SimpleHTMLParser
+from Products.GenericSetup.interfaces import IDAVAware
def addDocument(self, id, title='', description='', text_format='', text=''):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -18,9 +18,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
-from DateTime.DateTime import DateTime
-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 OFS.PropertyManager import PropertyManager
from zope.interface import implements
@@ -28,7 +28,6 @@
from Products.CMFCore.interfaces import IDublinCore
from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFCore.utils import getToolByName
-
from Products.CMFDefault.permissions import ModifyPortalContent
from Products.CMFDefault.permissions import View
from Products.CMFDefault.utils import _dtmldir
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -19,7 +19,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.app.container.interfaces import IObjectAddedEvent
from zope.component import adapter
from zope.component import getUtility
@@ -28,7 +28,6 @@
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.utils import getToolByName
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.interfaces import IFavorite
from Products.CMFDefault.interfaces import IMutableFavorite
Modified: Products.CMFDefault/trunk/Products/CMFDefault/File.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/File.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/File.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -18,7 +18,7 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from OFS.Cache import Cacheable
import OFS.Image # disambiguation
from zope.component.factory import Factory
@@ -29,13 +29,12 @@
from Products.CMFCore.utils import _OldCacheHeaders
from Products.CMFCore.utils import _setCacheHeaders
from Products.CMFCore.utils import _ViewEmulator
-from Products.GenericSetup.interfaces import IDAVAware
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.interfaces import IFile
from Products.CMFDefault.interfaces import IMutableFile
from Products.CMFDefault.permissions import ModifyPortalContent
from Products.CMFDefault.permissions import View
+from Products.GenericSetup.interfaces import IDAVAware
def addFile( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Image.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Image.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -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 OFS.Cache import Cacheable
import OFS.Image # disambiguation
from zope.component.factory import Factory
@@ -28,13 +28,12 @@
from Products.CMFCore.utils import _OldCacheHeaders
from Products.CMFCore.utils import _setCacheHeaders
from Products.CMFCore.utils import _ViewEmulator
-from Products.GenericSetup.interfaces import IDAVAware
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.interfaces import IImage
from Products.CMFDefault.interfaces import IMutableImage
from Products.CMFDefault.permissions import ModifyPortalContent
from Products.CMFDefault.permissions import View
+from Products.GenericSetup.interfaces import IDAVAware
def addImage( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Link.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Link.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -18,7 +18,7 @@
import urlparse
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
import transaction
from zope.component.factory import Factory
@@ -27,8 +27,6 @@
from Products.CMFCore.PortalContent import PortalContent
from Products.CMFCore.utils import contributorsplitter
from Products.CMFCore.utils import keywordsplitter
-from Products.GenericSetup.interfaces import IDAVAware
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.exceptions import ResourceLockedError
from Products.CMFDefault.interfaces import ILink
@@ -38,6 +36,7 @@
from Products.CMFDefault.utils import _dtmldir
from Products.CMFDefault.utils import formatRFC822Headers
from Products.CMFDefault.utils import parseHeadersBody
+from Products.GenericSetup.interfaces import IDAVAware
def addLink( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -19,14 +19,13 @@
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.special_dtml import DTMLFile
from zope.interface import implements
from Products.CMFCore.MembershipTool import MembershipTool as BaseTool
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import _getAuthenticatedUser
-
from Products.CMFDefault.Document import addDocument
from Products.CMFDefault.interfaces import IMembershipTool
from Products.CMFDefault.permissions import ListPortalMembers
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -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.Folder import Folder
from OFS.SimpleItem import SimpleItem
@@ -26,7 +26,6 @@
from Products.CMFCore.interfaces import IMetadataTool
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-
from Products.CMFDefault.exceptions import MetadataError
from Products.CMFDefault.permissions import ManagePortal
from Products.CMFDefault.permissions import ModifyPortalContent
Modified: Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -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 zope.component.factory import Factory
from zope.interface import implements
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Portal.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Portal.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -15,10 +15,9 @@
$Id$
"""
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from Products.CMFCore.PortalObject import PortalObjectBase
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.permissions import AddPortalContent
from Products.CMFDefault.permissions import AddPortalFolders
Modified: Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -17,7 +17,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 OFS.SimpleItem import SimpleItem
from Products.MailHost.interfaces import IMailHost
@@ -29,7 +29,6 @@
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-
from Products.CMFDefault.permissions import ManagePortal
from Products.CMFDefault.utils import _dtmldir
Modified: Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -20,16 +20,14 @@
from AccessControl.requestmethod import postonly
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 Products.MailHost.interfaces import IMailHost
from zope.component import getUtility
from zope.schema import ValidationError
-from Products.CMFCore.interfaces import IRegistrationTool
from Products.CMFCore.RegistrationTool import RegistrationTool as BaseTool
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import getToolByName
-
from Products.CMFDefault.permissions import ManagePortal
from Products.CMFDefault.utils import checkEmailAddress
from Products.CMFDefault.utils import Message as _
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -16,14 +16,13 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
from zope.component.factory import Factory
from zope.interface import implements
from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.PortalFolder import PortalFolder
-
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from Products.CMFDefault.permissions import ModifyPortalContent
from Products.CMFDefault.permissions import View
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -19,9 +19,9 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from DateTime.DateTime import DateTime
-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.SimpleItem import SimpleItem
from zope.interface import implements
@@ -30,7 +30,6 @@
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-
from Products.CMFDefault.exceptions import AccessControl_Unauthorized
from Products.CMFDefault.permissions import ManagePortal
from Products.CMFDefault.permissions import ManageProperties
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2009-01-03 16:27:40 UTC (rev 94487)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2009-01-03 16:28:03 UTC (rev 94488)
@@ -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 Products.Five import BrowserView
from zope.component import getUtility
More information about the Checkins
mailing list