[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ Cleaned up / normalized imports:
Tres Seaver
tseaver at palladion.com
Sat Dec 27 17:16:44 EST 2008
Log message for revision 94396:
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.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
U Products.DCWorkflow/trunk/Products/DCWorkflow/ContainerTab.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/States.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Variables.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/__init__.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/events.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/interfaces.py
U Products.DCWorkflow/trunk/Products/DCWorkflow/utils.py
-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt 2008-12-27 22:16:44 UTC (rev 94396)
@@ -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.
+
- Strip trailing newlines in order to properly match with a msgid when
translating transition descriptions.
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/ContainerTab.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/ContainerTab.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/ContainerTab.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,7 +15,9 @@
$Id$
"""
-from Acquisition import aq_base, aq_inner, aq_parent
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from Acquisition import aq_parent
from OFS.Folder import Folder
_marker = [] # Create a new marker object.
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -16,13 +16,13 @@
"""
# Zope
-from AccessControl import ClassSecurityInfo
-from AccessControl import getSecurityManager
-from AccessControl import Unauthorized
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
+from AccessControl.unauthorized import Unauthorized
from Acquisition import aq_inner
from Acquisition import aq_parent
+from App.class_init import default__class_init__ as InitializeClass
from DocumentTemplate.DT_Util import TemplateDict
-from Globals import InitializeClass
from OFS.Folder import Folder
from OFS.ObjectManager import bad_id
from zope.event import notify
@@ -36,17 +36,18 @@
from Products.CMFCore.WorkflowCore import WorkflowException
# DCWorkflow
-from events import BeforeTransitionEvent, AfterTransitionEvent
-from Expression import createExprContext
-from Expression import StateChangeInfo
-from interfaces import IDCWorkflowDefinition
-from permissions import ManagePortal
-from Transitions import TRIGGER_AUTOMATIC
-from Transitions import TRIGGER_USER_ACTION
-from utils import Message as _
-from utils import modifyRolesForGroup
-from utils import modifyRolesForPermission
-from WorkflowUIMixin import WorkflowUIMixin
+from Products.DCWorkflow.events import AfterTransitionEvent
+from Products.DCWorkflow.events import BeforeTransitionEvent
+from Products.DCWorkflow.Expression import createExprContext
+from Products.DCWorkflow.Expression import StateChangeInfo
+from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
+from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
+from Products.DCWorkflow.utils import Message as _
+from Products.DCWorkflow.utils import modifyRolesForGroup
+from Products.DCWorkflow.utils import modifyRolesForPermission
+from Products.DCWorkflow.WorkflowUIMixin import WorkflowUIMixin
def checkId(id):
res = bad_id(id)
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -16,11 +16,13 @@
"""
from warnings import warn
-import Globals
-from Globals import Persistent
-from Acquisition import aq_inner, aq_parent
-from AccessControl import getSecurityManager, ClassSecurityInfo
-from DateTime import DateTime
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from App.class_init import default__class_init__ as InitializeClass
+from DateTime.DateTime import DateTime
+from Persistence import Persistent
from Products.CMFCore.WorkflowCore import ObjectDeleted, ObjectMoved
from Products.CMFCore.Expression import Expression
@@ -118,7 +120,7 @@
date = self._date = DateTime()
return date
-Globals.InitializeClass(StateChangeInfo)
+InitializeClass(StateChangeInfo)
def createExprContext(sci):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -17,20 +17,20 @@
from cgi import escape
-from Globals import DTMLFile
-from Globals import InitializeClass
-from Globals import Persistent
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Explicit
from Acquisition import aq_base
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
+from Persistence import Persistent
from Products.CMFCore.utils import _checkPermission
-from Expression import Expression
-from Expression import StateChangeInfo
-from Expression import createExprContext
-from permissions import ManagePortal
-from utils import _dtmldir
+from Products.DCWorkflow.Expression import Expression
+from Products.DCWorkflow.Expression import StateChangeInfo
+from Products.DCWorkflow.Expression import createExprContext
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _dtmldir
class Guard (Persistent, Explicit):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,12 +15,12 @@
$Id$
"""
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from OFS.Folder import Folder
-from Globals import InitializeClass
-from AccessControl import ClassSecurityInfo
-from ContainerTab import ContainerTab
-from permissions import ManagePortal
+from Products.DCWorkflow.ContainerTab import ContainerTab
+from Products.DCWorkflow.permissions import ManagePortal
class Scripts (ContainerTab):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/States.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/States.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/States.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,19 +15,19 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
from AccessControl.requestmethod import postonly
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner
from Acquisition import aq_parent
-from Globals import DTMLFile
-from Globals import InitializeClass
-from Globals import PersistentMapping
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
+from Persistence import PersistentMapping
from OFS.SimpleItem import SimpleItem
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from ContainerTab import ContainerTab
-from permissions import ManagePortal
-from utils import _dtmldir
+from Products.DCWorkflow.ContainerTab import ContainerTab
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _dtmldir
class StateDefinition(SimpleItem):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,19 +15,19 @@
$Id$
"""
-from OFS.SimpleItem import SimpleItem
-from Globals import DTMLFile
-from Globals import PersistentMapping
-from Globals import InitializeClass
+from AccessControl import ClassSecurityInfo
from Acquisition import aq_inner
from Acquisition import aq_parent
-from AccessControl import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
+from OFS.SimpleItem import SimpleItem
+from Persistence import PersistentMapping
-from ContainerTab import ContainerTab
-from Guard import Guard
-from permissions import ManagePortal
-from utils import _dtmldir
-from Expression import Expression
+from Products.DCWorkflow.ContainerTab import ContainerTab
+from Products.DCWorkflow.Guard import Guard
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _dtmldir
+from Products.DCWorkflow.Expression import Expression
TRIGGER_AUTOMATIC = 0
TRIGGER_USER_ACTION = 1
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Variables.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Variables.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Variables.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,18 +15,18 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
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 OFS.SimpleItem import SimpleItem
-from ContainerTab import ContainerTab
-from Expression import Expression
-from Guard import Guard
-from permissions import ManagePortal
-from utils import _dtmldir
+from Products.DCWorkflow.ContainerTab import ContainerTab
+from Products.DCWorkflow.Expression import Expression
+from Products.DCWorkflow.Guard import Guard
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _dtmldir
class VariableDefinition(SimpleItem):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -17,17 +17,17 @@
import os
-from Globals import DTMLFile
-from Globals import InitializeClass
-from AccessControl import ClassSecurityInfo
from AccessControl.requestmethod import postonly
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
from Acquisition import aq_get
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from permissions import ManagePortal
-from Guard import Guard
-from utils import _dtmldir
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.Guard import Guard
+from Products.DCWorkflow.utils import _dtmldir
class WorkflowUIMixin:
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,18 +15,18 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner
from Acquisition import aq_parent
-from Globals import DTMLFile
-from Globals import InitializeClass
-from Globals import PersistentMapping
+from App.class_init import default__class_init__ as InitializeClass
+from App.special_dtml import DTMLFile
+from Persistence import PersistentMapping
from OFS.SimpleItem import SimpleItem
-from ContainerTab import ContainerTab
-from Guard import Guard
-from permissions import ManagePortal
-from utils import _dtmldir
+from Products.DCWorkflow.ContainerTab import ContainerTab
+from Products.DCWorkflow.Guard import Guard
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _dtmldir
class WorklistDefinition(SimpleItem):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/__init__.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/__init__.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/__init__.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,13 +15,17 @@
$Id$
"""
-from Products.CMFCore.utils import registerIcon
+def initialize(context):
-import DCWorkflow, States, Transitions, Variables, Worklists, Scripts
+ from Products.CMFCore.utils import registerIcon
+ import DCWorkflow
+ import States
+ import Transitions
+ import Variables
+ import Worklists
+ import Scripts
-def initialize(context):
-
context.registerHelp(directory='help')
context.registerHelpTitle('DCWorkflow')
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/events.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/events.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/events.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -1,12 +1,15 @@
from zope.interface import implements
from zope.component.interfaces import ObjectEvent
-from interfaces import ITransitionEvent, IBeforeTransitionEvent, IAfterTransitionEvent
+from Products.DCWorkflow.interfaces import IAfterTransitionEvent
+from Products.DCWorkflow.interfaces import IBeforeTransitionEvent
+from Products.DCWorkflow.interfaces import ITransitionEvent
class TransitionEvent(ObjectEvent):
implements(ITransitionEvent)
- def __init__(self, obj, workflow, old_state, new_state, transition, status, kwargs):
+ def __init__(self, obj, workflow, old_state, new_state,
+ transition, status, kwargs):
ObjectEvent.__init__(self, obj)
self.workflow = workflow
self.old_state = old_state
@@ -19,4 +22,4 @@
implements(IBeforeTransitionEvent)
class AfterTransitionEvent(TransitionEvent):
- implements(IAfterTransitionEvent)
\ No newline at end of file
+ implements(IAfterTransitionEvent)
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -18,20 +18,20 @@
import re
from xml.dom.minidom import parseString
-from Expression import Expression
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from zope.component import adapts
from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import BodyAdapterBase
-from utils import _xmldir
-from DCWorkflow import DCWorkflowDefinition
-from interfaces import IDCWorkflowDefinition
-from permissions import ManagePortal
+from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
+from Products.DCWorkflow.Expression import Expression
+from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
+from Products.DCWorkflow.permissions import ManagePortal
+from Products.DCWorkflow.utils import _xmldir
TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/interfaces.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/interfaces.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/interfaces.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -15,7 +15,8 @@
$Id$
"""
-from zope.interface import Interface, Attribute
+from zope.interface import Attribute
+from zope.interface import Interface
from zope.component.interfaces import IObjectEvent
class IDCWorkflowDefinition(Interface):
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/utils.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/utils.py 2008-12-27 22:06:40 UTC (rev 94395)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/utils.py 2008-12-27 22:16:44 UTC (rev 94396)
@@ -17,9 +17,9 @@
import os
-from AccessControl import ModuleSecurityInfo
from AccessControl.Permission import Permission
from AccessControl.Role import gather_permissions
+from AccessControl.SecurityInfo import ModuleSecurityInfo
from App.Common import package_home
from zope.i18nmessageid import MessageFactory
More information about the Checkins
mailing list