[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Cleaned up / normalized imports:
Tres Seaver
tseaver at palladion.com
Sat Dec 27 16:48:36 EST 2008
Log message for revision 94390:
Cleaned up / normalized imports:
o Don't import from Globals; instead, use real locations.
o Make other imports use the actual source module, rather than an
intermediate (e.g., prefer importing 'ClassSecurityInfo' from
'AccessControl.SecurityInfo' rather than from 'AccessControl').
o Avoid relative imports, which will break in later versions of Python.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
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/file.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
U Products.CMFDefault/trunk/Products/CMFDefault/factory.py
U Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py
U Products.CMFDefault/trunk/Products/CMFDefault/utils.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2008-12-27 21:48:36 UTC (rev 94390)
@@ -4,6 +4,16 @@
2.2.0 (unreleased)
------------------
+- Cleaned up / normalized imports:
+
+ o Don't import from Globals; instead, use real locations.
+
+ o Make other imports use the actual source module, rather than an
+ intermediate (e.g., prefer importing 'ClassSecurityInfo' from
+ 'AccessControl.SecurityInfo' rather than from 'AccessControl').
+
+ o Avoid relative imports, which will break in later versions of Python.
+
- profiles: Added add view expressions to content type definitions.
- skins/zpt_generic/permalink.py: fix typos, wrap object correctly.
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DefaultWorkflow.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,12 +15,12 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
-from DateTime import DateTime
-from Globals 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
@@ -29,11 +29,11 @@
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.utils import SimpleItemWithProperties
-from exceptions import AccessControl_Unauthorized
-from permissions import ModifyPortalContent
-from permissions import RequestReview
-from permissions import ReviewPortalContent
-from permissions import View
+from Products.CMFDefault.exceptions import AccessControl_Unauthorized
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import RequestReview
+from Products.CMFDefault.permissions import ReviewPortalContent
+from Products.CMFDefault.permissions import View
class DefaultWorkflowDefinition(SimpleItemWithProperties):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DiscussionItem.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,13 +15,16 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
-from Acquisition import Implicit, aq_base, aq_inner, aq_parent
-from DateTime import DateTime
-from Globals import InitializeClass
-from Globals import Persistent
-from Globals import PersistentMapping
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from Acquisition import Implicit
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+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
from zope.component import getUtility
from zope.interface import implements
@@ -30,11 +33,11 @@
from Products.CMFCore.interfaces import IDiscussionResponse
from Products.CMFCore.interfaces import IDiscussionTool
-from Document import Document
-from permissions import AccessContentsInformation
-from permissions import ManagePortal
-from permissions import ReplyToItem
-from permissions import View
+from Products.CMFDefault.Document import Document
+from Products.CMFDefault.permissions import AccessContentsInformation
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.permissions import ReplyToItem
+from Products.CMFDefault.permissions import View
class DiscussionItem(Document):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -14,11 +14,10 @@
$Id$
"""
-
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import DTMLFile
-from Globals import InitializeClass
+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
@@ -29,12 +28,12 @@
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-from DiscussionItem import DiscussionItemContainer
-from exceptions import AccessControl_Unauthorized
-from exceptions import DiscussionNotAllowed
-from permissions import ManagePortal
-from permissions import ModifyPortalContent
-from utils import _dtmldir
+from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
+from Products.CMFDefault.exceptions import AccessControl_Unauthorized
+from Products.CMFDefault.exceptions import DiscussionNotAllowed
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.utils import _dtmldir
_marker = []
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -14,21 +14,20 @@
$Id$
"""
-
-import transaction
-from AccessControl import ClassSecurityInfo
-from AccessControl import getSecurityManager
-from Acquisition import aq_base
-from App.config import getConfiguration
-from DocumentTemplate.DT_Util import html_quote
-from Globals import DTMLFile
-from Globals import InitializeClass
try:
from reStructuredText import HTML as ReST
REST_AVAILABLE = True
except ImportError:
REST_AVAILABLE = False
-
+
+from AccessControl.SecurityInfo import ClassSecurityInfo
+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.special_dtml import DTMLFile
+from DocumentTemplate.DT_Util import html_quote
+import transaction
from zope.component import queryUtility
from zope.component.factory import Factory
from zope.interface import implements
@@ -40,20 +39,20 @@
from Products.CMFCore.utils import keywordsplitter
from Products.GenericSetup.interfaces import IDAVAware
-from DublinCore import DefaultDublinCoreImpl
-from exceptions import EditingConflict
-from exceptions import ResourceLockedError
-from interfaces import IDocument
-from interfaces import IMutableDocument
-from permissions import ModifyPortalContent
-from permissions import View
-from utils import _dtmldir
-from utils import bodyfinder
-from utils import formatRFC822Headers
-from utils import html_headcheck
-from utils import Message as _
-from utils import parseHeadersBody
-from utils import SimpleHTMLParser
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+from Products.CMFDefault.exceptions import EditingConflict
+from Products.CMFDefault.exceptions import ResourceLockedError
+from Products.CMFDefault.interfaces import IDocument
+from Products.CMFDefault.interfaces import IMutableDocument
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import View
+from Products.CMFDefault.utils import _dtmldir
+from Products.CMFDefault.utils import bodyfinder
+from Products.CMFDefault.utils import formatRFC822Headers
+from Products.CMFDefault.utils import html_headcheck
+from Products.CMFDefault.utils import Message as _
+from Products.CMFDefault.utils import parseHeadersBody
+from Products.CMFDefault.utils import SimpleHTMLParser
def addDocument(self, id, title='', description='', text_format='', text=''):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,12 +15,12 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
-from AccessControl import getSecurityManager
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
from Acquisition import aq_base
from DateTime.DateTime import DateTime
-from Globals import DTMLFile
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
from OFS.PropertyManager import PropertyManager
from zope.interface import implements
@@ -29,11 +29,11 @@
from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFCore.utils import getToolByName
-from permissions import ModifyPortalContent
-from permissions import View
-from utils import _dtmldir
-from utils import semi_split
-from utils import tuplize
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import View
+from Products.CMFDefault.utils import _dtmldir
+from Products.CMFDefault.utils import semi_split
+from Products.CMFDefault.utils import tuplize
_marker=[]
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -17,9 +17,9 @@
import urlparse
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import adapter
from zope.component import getUtility
@@ -29,11 +29,11 @@
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.utils import getToolByName
-from DublinCore import DefaultDublinCoreImpl
-from interfaces import IFavorite
-from interfaces import IMutableFavorite
-from Link import Link
-from permissions import View
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+from Products.CMFDefault.interfaces import IFavorite
+from Products.CMFDefault.interfaces import IMutableFavorite
+from Products.CMFDefault.Link import Link
+from Products.CMFDefault.permissions import View
def addFavorite(self, id, title='', remote_url='', description=''):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/File.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/File.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/File.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -17,10 +17,10 @@
$Id$
"""
-import OFS.Image
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from OFS.Cache import Cacheable
+import OFS.Image # disambiguation
from zope.component.factory import Factory
from zope.interface import implements
@@ -31,11 +31,11 @@
from Products.CMFCore.utils import _ViewEmulator
from Products.GenericSetup.interfaces import IDAVAware
-from DublinCore import DefaultDublinCoreImpl
-from interfaces import IFile
-from interfaces import IMutableFile
-from permissions import ModifyPortalContent
-from permissions import View
+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
def addFile( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Image.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Image.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -16,10 +16,10 @@
$Id$
"""
-import OFS.Image
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from OFS.Cache import Cacheable
+import OFS.Image # disambiguation
from zope.component.factory import Factory
from zope.interface import implements
@@ -30,11 +30,11 @@
from Products.CMFCore.utils import _ViewEmulator
from Products.GenericSetup.interfaces import IDAVAware
-from DublinCore import DefaultDublinCoreImpl
-from interfaces import IImage
-from interfaces import IMutableImage
-from permissions import ModifyPortalContent
-from permissions import View
+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
def addImage( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Link.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Link.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -17,10 +17,10 @@
import urlparse
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
import transaction
-from AccessControl import ClassSecurityInfo
-from Globals import DTMLFile
-from Globals import InitializeClass
from zope.component.factory import Factory
from zope.interface import implements
@@ -29,15 +29,15 @@
from Products.CMFCore.utils import keywordsplitter
from Products.GenericSetup.interfaces import IDAVAware
-from DublinCore import DefaultDublinCoreImpl
-from exceptions import ResourceLockedError
-from interfaces import ILink
-from interfaces import IMutableLink
-from permissions import ModifyPortalContent
-from permissions import View
-from utils import _dtmldir
-from utils import formatRFC822Headers
-from utils import parseHeadersBody
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+from Products.CMFDefault.exceptions import ResourceLockedError
+from Products.CMFDefault.interfaces import ILink
+from Products.CMFDefault.interfaces import IMutableLink
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import View
+from Products.CMFDefault.utils import _dtmldir
+from Products.CMFDefault.utils import formatRFC822Headers
+from Products.CMFDefault.utils import parseHeadersBody
def addLink( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MembershipTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,25 +15,25 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
from Acquisition import aq_inner
from Acquisition import aq_parent
-from Globals import DTMLFile
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as 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 Document import addDocument
-from interfaces import IMembershipTool
-from permissions import ListPortalMembers
-from permissions import ManagePortal
-from permissions import ManageUsers
-from permissions import View
-from utils import _dtmldir
+from Products.CMFDefault.Document import addDocument
+from Products.CMFDefault.interfaces import IMembershipTool
+from Products.CMFDefault.permissions import ListPortalMembers
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.permissions import ManageUsers
+from Products.CMFDefault.permissions import View
+from Products.CMFDefault.utils import _dtmldir
DEFAULT_MEMBER_CONTENT = """\
Default page for %s
Modified: Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/MetadataTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,23 +15,23 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
-from Globals import DTMLFile
-from Globals import InitializeClass
-from Globals import PersistentMapping
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
+from Persistence import PersistentMapping
from zope.interface import implements
from Products.CMFCore.interfaces import IMetadataTool
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-from exceptions import MetadataError
-from permissions import ManagePortal
-from permissions import ModifyPortalContent
-from permissions import View
-from utils import _dtmldir
+from Products.CMFDefault.exceptions import MetadataError
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import View
+from Products.CMFDefault.utils import _dtmldir
class MetadataElementPolicy( SimpleItem ):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/NewsItem.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,15 +15,15 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from zope.component.factory import Factory
from zope.interface import implements
-from Document import Document
-from interfaces import IMutableNewsItem
-from interfaces import INewsItem
-from permissions import ModifyPortalContent
+from Products.CMFDefault.Document import Document
+from Products.CMFDefault.interfaces import IMutableNewsItem
+from Products.CMFDefault.interfaces import INewsItem
+from Products.CMFDefault.permissions import ModifyPortalContent
def addNewsItem( self
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Portal.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Portal.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,16 +15,16 @@
$Id$
"""
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from Products.CMFCore.PortalObject import PortalObjectBase
-from DublinCore import DefaultDublinCoreImpl
-from permissions import AddPortalContent
-from permissions import AddPortalFolders
-from permissions import ListPortalMembers
-from permissions import ReplyToItem
-from permissions import View
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+from Products.CMFDefault.permissions import AddPortalContent
+from Products.CMFDefault.permissions import AddPortalFolders
+from Products.CMFDefault.permissions import ListPortalMembers
+from Products.CMFDefault.permissions import ReplyToItem
+from Products.CMFDefault.permissions import View
class CMFSite(PortalObjectBase, DefaultDublinCoreImpl):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/PropertiesTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,9 +15,10 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner, aq_parent
-from Globals import InitializeClass, DTMLFile
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
from OFS.SimpleItem import SimpleItem
from Products.MailHost.interfaces import IMailHost
from zope.component import getUtility
@@ -29,8 +30,8 @@
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-from permissions import ManagePortal
-from utils import _dtmldir
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.utils import _dtmldir
class PropertiesTool(UniqueObject, SimpleItem):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/RegistrationTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -17,10 +17,10 @@
from warnings import warn
-from AccessControl import ClassSecurityInfo
from AccessControl.requestmethod import postonly
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from Products.MailHost.interfaces import IMailHost
from zope.component import getUtility
from zope.schema import ValidationError
@@ -30,9 +30,9 @@
from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.utils import getToolByName
-from permissions import ManagePortal
-from utils import checkEmailAddress
-from utils import Message as _
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.utils import checkEmailAddress
+from Products.CMFDefault.utils import Message as _
class RegistrationTool(BaseTool):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SkinnedFolder.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,8 +15,8 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from zope.component.factory import Factory
from zope.interface import implements
@@ -24,9 +24,9 @@
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.PortalFolder import PortalFolder
-from DublinCore import DefaultDublinCoreImpl
-from permissions import ModifyPortalContent
-from permissions import View
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+from Products.CMFDefault.permissions import ModifyPortalContent
+from Products.CMFDefault.permissions import View
class SkinnedFolder(CMFCatalogAware, PortalFolder):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -17,11 +17,11 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from DateTime import DateTime
-from Globals import HTMLFile
-from Globals import InitializeClass
+from DateTime.DateTime import DateTime
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import HTMLFile
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
@@ -31,20 +31,17 @@
from Products.CMFCore.utils import registerToolInterface
from Products.CMFCore.utils import UniqueObject
-from exceptions import AccessControl_Unauthorized
-from permissions import ManagePortal
-from permissions import ManageProperties
-from SyndicationInfo import SyndicationInformation
-from utils import _dtmldir
+from Products.CMFDefault.exceptions import AccessControl_Unauthorized
+from Products.CMFDefault.permissions import ManagePortal
+from Products.CMFDefault.permissions import ManageProperties
+from Products.CMFDefault.SyndicationInfo import SyndicationInformation
+from Products.CMFDefault.utils import _dtmldir
class SyndicationTool(UniqueObject, SimpleItem):
-
- """
- The syndication tool manages the site-wide policy for
+ """ The syndication tool manages the site-wide policy for
syndication of folder content as RSS.
"""
-
implements(ISyndicationTool)
id = 'portal_syndication'
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,6 +15,8 @@
$Id$
"""
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from zope.component import adapts
from zope.formlib import form
from zope.interface import implements
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,15 +15,20 @@
$Id$
"""
-from DocumentTemplate import sequence
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from DocumentTemplate import sequence # for sort()
+from App.class_init import default__class_init__ as InitializeClass
from Products.PythonScripts.standard import thousands_commas
-from zope.formlib import form
+from zope.formlib.form import FormFields
from zope.schema import ASCIILine
from ZTUtils import Batch
from ZTUtils import LazyFilter
from ZTUtils import make_query
from Products.CMFCore.interfaces import IDynamicType
+from Products.CMFDefault.browser.utils import decode
+from Products.CMFDefault.browser.utils import memoize
+from Products.CMFDefault.browser.utils import ViewBase
from Products.CMFDefault.exceptions import CopyError
from Products.CMFDefault.exceptions import zExceptions_Unauthorized
from Products.CMFDefault.formlib.form import ContentAddFormBase
@@ -34,20 +39,16 @@
from Products.CMFDefault.permissions import ManageProperties
from Products.CMFDefault.permissions import ViewManagementScreens
from Products.CMFDefault.utils import html_marshal
+from Products.CMFDefault.utils import Message as _
from Products.CMFDefault.utils import translate
-from Products.CMFDefault.utils import Message as _
-from utils import decode
-from utils import memoize
-from utils import ViewBase
-
class FallbackAddView(ContentAddFormBase):
"""Add view for IDynamicType content.
"""
- form_fields = form.FormFields(ASCIILine(__name__='id', title=_(u'ID')))
+ form_fields = FormFields(ASCIILine(__name__='id', title=_(u'ID')))
form_fields['id'].custom_widget = IDInputWidget
def createAndAdd(self, data):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -16,7 +16,7 @@
"""
from AccessControl.SecurityInfo import ClassSecurityInfo
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from Products.Five import BrowserView
from zope.component import getUtility
Modified: Products.CMFDefault/trunk/Products/CMFDefault/factory.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/factory.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/factory.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -24,8 +24,8 @@
from Products.GenericSetup import profile_registry
from Products.GenericSetup.tool import SetupTool
-from Portal import CMFSite
-from utils import _wwwdir
+from Products.CMFDefault.Portal import CMFSite
+from Products.CMFDefault.utils import _wwwdir
_TOOL_ID = 'portal_setup'
Modified: Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/setuphandlers.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,7 +15,7 @@
$Id$
"""
-from exceptions import BadRequest
+from Products.CMFDefault.exceptions import BadRequest
def importVarious(context):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/utils.py 2008-12-27 21:45:39 UTC (rev 94389)
+++ Products.CMFDefault/trunk/Products/CMFDefault/utils.py 2008-12-27 21:48:36 UTC (rev 94390)
@@ -15,23 +15,23 @@
$Id$
"""
+from email.Header import make_header
+from email.MIMEText import MIMEText
import os
import re
-import StringIO
import rfc822
-from email.Header import make_header
-from email.MIMEText import MIMEText
from sgmllib import SGMLParser
+import StringIO
-from AccessControl import ModuleSecurityInfo
-from Globals import package_home
+from AccessControl.SecurityInfo import ModuleSecurityInfo
+from App.Common import package_home
from Products.PageTemplates.GlobalTranslationService \
import getGlobalTranslationService
from ZTUtils.Zope import complex_marshal
-from zope import i18n
from zope.component import getUtility
from zope.component import queryUtility
+from zope import i18n # disambiguation
from zope.i18n.interfaces import IUserPreferredCharsets
from zope.i18nmessageid import MessageFactory
More information about the Checkins
mailing list