[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ - import cleanup
Yvo Schubbe
y.2009 at wcm-solutions.de
Sat Jan 3 11:28:52 EST 2009
Log message for revision 94491:
- import cleanup
Changed:
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/exportimport.py
-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/DCWorkflow.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -15,27 +15,23 @@
$Id$
"""
-# Zope
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 App.class_init import InitializeClass
from DocumentTemplate.DT_Util import TemplateDict
from OFS.Folder import Folder
from OFS.ObjectManager import bad_id
from zope.event import notify
from zope.interface import implements
-# CMFCore
from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.WorkflowCore import ObjectDeleted
from Products.CMFCore.WorkflowCore import ObjectMoved
from Products.CMFCore.WorkflowCore import WorkflowException
-
-# DCWorkflow
from Products.DCWorkflow.events import AfterTransitionEvent
from Products.DCWorkflow.events import BeforeTransitionEvent
from Products.DCWorkflow.Expression import createExprContext
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -14,21 +14,21 @@
$Id$
"""
+
from warnings import warn
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 App.class_init import InitializeClass
from DateTime.DateTime import DateTime
-from Persistence import Persistent
+from Products.PageTemplates.Expressions import getEngine
+from Products.PageTemplates.Expressions import SecureModuleImporter
from Products.CMFCore.WorkflowCore import ObjectDeleted, ObjectMoved
-from Products.CMFCore.Expression import Expression
+from Products.CMFCore.Expression import Expression # BBB: old location
from Products.CMFCore.interfaces import ISiteRoot
-from Products.PageTemplates.Expressions import getEngine
-from Products.PageTemplates.Expressions import SecureModuleImporter
# We don't import SafeMapping from Products.PageTemplates.TALES
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Guard.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -20,13 +20,12 @@
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.class_init import InitializeClass
from App.special_dtml import DTMLFile
from Persistence import Persistent
+from Products.CMFCore.Expression import Expression
from Products.CMFCore.utils import _checkPermission
-
-from Products.DCWorkflow.Expression import Expression
from Products.DCWorkflow.Expression import StateChangeInfo
from Products.DCWorkflow.Expression import createExprContext
from Products.DCWorkflow.permissions import ManagePortal
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Scripts.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -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 OFS.Folder import Folder
from Products.DCWorkflow.ContainerTab import ContainerTab
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/States.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/States.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/States.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -19,7 +19,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 Persistence import PersistentMapping
from OFS.SimpleItem import SimpleItem
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Transitions.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -18,16 +18,16 @@
from AccessControl 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 Persistence import PersistentMapping
+from Products.CMFCore.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 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Variables.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -18,12 +18,12 @@
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 Products.CMFCore.Expression import Expression
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
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/WorkflowUIMixin.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -19,10 +19,9 @@
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 App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.DCWorkflow.permissions import ManagePortal
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Worklists.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -18,10 +18,10 @@
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 Persistence import PersistentMapping
-from OFS.SimpleItem import SimpleItem
from Products.DCWorkflow.ContainerTab import ContainerTab
from Products.DCWorkflow.Guard import Guard
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py 2009-01-03 16:28:36 UTC (rev 94490)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py 2009-01-03 16:28:52 UTC (rev 94491)
@@ -20,20 +20,19 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
+from Persistence import PersistentMapping
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from zope.component import adapts
-from Products.GenericSetup.interfaces import ISetupEnviron
-from Products.GenericSetup.utils import BodyAdapterBase
-
+from Products.CMFCore.Expression import Expression
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
+from Products.GenericSetup.interfaces import ISetupEnviron
+from Products.GenericSetup.utils import BodyAdapterBase
-
TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
_FILENAME = 'workflows.xml'
@@ -1027,7 +1026,6 @@
""" Initialize DCWorkflow states
"""
- from Globals import PersistentMapping
from Products.DCWorkflow.States import StateDefinition
for s_info in states:
@@ -1065,7 +1063,6 @@
""" Initialize DCWorkflow transitions
"""
- from Globals import PersistentMapping
from Products.DCWorkflow.Transitions import TransitionDefinition
for t_info in transitions:
@@ -1107,7 +1104,6 @@
""" Initialize DCWorkflow worklists
"""
- from Globals import PersistentMapping
from Products.DCWorkflow.Worklists import WorklistDefinition
for w_info in worklists:
More information about the Checkins
mailing list