- package structure and lint changes

setup.py

@@ -32,6 +32,7 @@ def _package_doc(name):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Software Development',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         ],
@@ -45,7 +46,8 @@ def _package_doc(name):
         'Sources': 'https://github.com/zopefoundation/Products.DCWorkflow',
       },
       license='ZPL 2.1',
-      packages=find_packages(),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       include_package_data=True,
       namespace_packages=['Products'],
       zip_safe=False,

src/Products/DCWorkflow/DCWorkflow.py

@@ -31,17 +31,17 @@
 from Products.CMFCore.WorkflowCore import ObjectMoved
 from Products.CMFCore.WorkflowCore import WorkflowException
 
-from Products.DCWorkflow.events import AfterTransitionEvent
-from Products.DCWorkflow.events import BeforeTransitionEvent
-from Products.DCWorkflow.Expression import StateChangeInfo
-from Products.DCWorkflow.Expression import createExprContext
-from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
-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
+from .events import AfterTransitionEvent
+from .events import BeforeTransitionEvent
+from .Expression import StateChangeInfo
+from .Expression import createExprContext
+from .interfaces import IDCWorkflowDefinition
+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
 
 
 def checkId(id):

src/Products/DCWorkflow/Guard.py

@@ -24,9 +24,9 @@
 from Products.CMFCore.permissions import ManagePortal
 from Products.CMFCore.utils import _checkPermission
 
-from Products.DCWorkflow.Expression import StateChangeInfo
-from Products.DCWorkflow.Expression import createExprContext
-from Products.DCWorkflow.utils import _dtmldir
+from .Expression import StateChangeInfo
+from .Expression import createExprContext
+from .utils import _dtmldir
 
 
 try:

src/Products/DCWorkflow/Scripts.py

@@ -19,7 +19,7 @@
 
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.ContainerTab import ContainerTab
+from .ContainerTab import ContainerTab
 
 
 class Scripts(ContainerTab):

src/Products/DCWorkflow/States.py

@@ -25,8 +25,8 @@
 
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.ContainerTab import ContainerTab
-from Products.DCWorkflow.utils import _dtmldir
+from .ContainerTab import ContainerTab
+from .utils import _dtmldir
 
 
 class StateDefinition(SimpleItem):

src/Products/DCWorkflow/Transitions.py

@@ -24,9 +24,9 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.ContainerTab import ContainerTab
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.utils import _dtmldir
+from .ContainerTab import ContainerTab
+from .Guard import Guard
+from .utils import _dtmldir
 
 
 TRIGGER_AUTOMATIC = 0

src/Products/DCWorkflow/Variables.py

@@ -24,9 +24,9 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.ContainerTab import ContainerTab
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.utils import _dtmldir
+from .ContainerTab import ContainerTab
+from .Guard import Guard
+from .utils import _dtmldir
 
 
 class VariableDefinition(SimpleItem):

src/Products/DCWorkflow/WorkflowUIMixin.py

@@ -24,8 +24,8 @@
 
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.utils import _dtmldir
+from .Guard import Guard
+from .utils import _dtmldir
 
 
 class WorkflowUIMixin(object):

src/Products/DCWorkflow/Worklists.py

@@ -27,12 +27,12 @@
 from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.ContainerTab import ContainerTab
-from Products.DCWorkflow.Expression import Expression
-from Products.DCWorkflow.Expression import StateChangeInfo
-from Products.DCWorkflow.Expression import createExprContext
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.utils import _dtmldir
+from .ContainerTab import ContainerTab
+from .Expression import Expression
+from .Expression import StateChangeInfo
+from .Expression import createExprContext
+from .Guard import Guard
+from .utils import _dtmldir
 
 
 tales_re = re.compile(r'(\w+:)?(.*)')

src/Products/DCWorkflow/__init__.py

@@ -19,11 +19,11 @@ def initialize(context):
     from Products.CMFCore.utils import registerIcon
 
     from . import DCWorkflow
+    from . import Scripts
     from . import States
     from . import Transitions
     from . import Variables
     from . import Worklists
-    from . import Scripts
 
     registerIcon(DCWorkflow.DCWorkflowDefinition,
                  'images/workflow.gif', globals())

src/Products/DCWorkflow/browser/workflow.py

@@ -21,7 +21,7 @@
 from zope.component import queryMultiAdapter
 from zope.component import queryUtility
 
-from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
+from ..DCWorkflow import DCWorkflowDefinition
 
 
 class DCWorkflowDefinitionAddView(AddWithPresettingsViewBase):

src/Products/DCWorkflow/events.py

@@ -1,9 +1,9 @@
 from zope.interface import implementer
 from zope.interface.interfaces import ObjectEvent
 
-from Products.DCWorkflow.interfaces import IAfterTransitionEvent
-from Products.DCWorkflow.interfaces import IBeforeTransitionEvent
-from Products.DCWorkflow.interfaces import ITransitionEvent
+from .interfaces import IAfterTransitionEvent
+from .interfaces import IBeforeTransitionEvent
+from .interfaces import ITransitionEvent
 
 
 @implementer(ITransitionEvent)

src/Products/DCWorkflow/exportimport.py

@@ -34,10 +34,10 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
-from Products.DCWorkflow.utils import _xmldir
+from .DCWorkflow import DCWorkflowDefinition
+from .Guard import Guard
+from .interfaces import IDCWorkflowDefinition
+from .utils import _xmldir
 
 
 TRIGGER_TYPES = ('AUTOMATIC', 'USER')
@@ -1019,7 +1019,7 @@ def _initDCWorkflowCreationGuard(workflow, guard):
 def _initDCWorkflowVariables(workflow, variables):
     """ Initialize DCWorkflow variables
     """
-    from Products.DCWorkflow.Variables import VariableDefinition
+    from .Variables import VariableDefinition
 
     for v_info in variables:
         if six.PY2:
@@ -1053,7 +1053,7 @@ def _initDCWorkflowVariables(workflow, variables):
 def _initDCWorkflowStates(workflow, states):
     """ Initialize DCWorkflow states
     """
-    from Products.DCWorkflow.States import StateDefinition
+    from .States import StateDefinition
 
     for s_info in states:
         if six.PY2:
@@ -1088,7 +1088,7 @@ def _initDCWorkflowStates(workflow, states):
 def _initDCWorkflowTransitions(workflow, transitions):
     """ Initialize DCWorkflow transitions
     """
-    from Products.DCWorkflow.Transitions import TransitionDefinition
+    from .Transitions import TransitionDefinition
 
     for t_info in transitions:
 
@@ -1127,7 +1127,7 @@ def _initDCWorkflowTransitions(workflow, transitions):
 def _initDCWorkflowWorklists(workflow, worklists):
     """ Initialize DCWorkflow worklists
     """
-    from Products.DCWorkflow.Worklists import WorklistDefinition
+    from .Worklists import WorklistDefinition
 
     for w_info in worklists:
 

src/Products/DCWorkflow/testing.py

@@ -26,6 +26,7 @@ class ExportImportZCMLLayer(ZopeLite):
     def setUp(cls):
         import Products.Five
         import Products.GenericSetup
+
         import Products.CMFCore
         import Products.CMFCore.exportimport
         import Products.DCWorkflow

src/Products/DCWorkflow/tests/test_DCWorkflow.py

@@ -32,8 +32,8 @@
 from Products.CMFCore.tests.base.testcase import SecurityTest
 from Products.CMFCore.WorkflowTool import WorkflowTool
 
-from Products.DCWorkflow.interfaces import IAfterTransitionEvent
-from Products.DCWorkflow.interfaces import IBeforeTransitionEvent
+from ..interfaces import IAfterTransitionEvent
+from ..interfaces import IBeforeTransitionEvent
 
 
 class DCWorkflowDefinitionTests(SecurityTest):
@@ -54,12 +54,13 @@ def setUp(self):
 
     def test_interfaces(self):
         from Products.CMFCore.interfaces import IWorkflowDefinition
-        from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
+
+        from ..DCWorkflow import DCWorkflowDefinition
 
         verifyClass(IWorkflowDefinition, DCWorkflowDefinition)
 
     def _constructDummyWorkflow(self):
-        from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
+        from ..DCWorkflow import DCWorkflowDefinition
 
         wtool = self.wtool
         wtool._setObject('wf', DCWorkflowDefinition('wf'))

src/Products/DCWorkflow/tests/test_exportimport.py

@@ -30,11 +30,11 @@
     _WorkflowSetup as WorkflowSetupBase
 from Products.CMFCore.testing import DummyWorkflow
 
-from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
-from Products.DCWorkflow.Guard import Guard
-from Products.DCWorkflow.testing import ExportImportZCMLLayer
-from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
-from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
+from ..DCWorkflow import DCWorkflowDefinition
+from ..Guard import Guard
+from ..testing import ExportImportZCMLLayer
+from ..Transitions import TRIGGER_AUTOMATIC
+from ..Transitions import TRIGGER_USER_ACTION
 
 
 class _GuardChecker:
@@ -186,8 +186,7 @@ class WorkflowDefinitionConfiguratorTests(_WorkflowSetup, _GuardChecker):
     layer = ExportImportZCMLLayer
 
     def _getTargetClass(self):
-        from Products.DCWorkflow.exportimport \
-                import WorkflowDefinitionConfigurator
+        from ..exportimport import WorkflowDefinitionConfigurator
 
         return WorkflowDefinitionConfigurator
 
@@ -332,7 +331,7 @@ def test_getWorkflowInfo_dcworkflow_states(self):
                     self.assertEqual(type, 'string')
 
     def test_getWorkflowInfo_dcworkflow_transitions(self):
-        from Products.DCWorkflow.exportimport import TRIGGER_TYPES
+        from ..exportimport import TRIGGER_TYPES
 
         WF_ID = 'dcworkflow_transitions'
 
@@ -746,7 +745,7 @@ def test_parseWorkflowXML_state_w_missing_acquired(self):
             self.assertEqual(tuple(state['groups']), tuple(expected[4]))
 
     def test_parseWorkflowXML_normal_transitions(self):
-        from Products.DCWorkflow.exportimport import TRIGGER_TYPES
+        from ..exportimport import TRIGGER_TYPES
 
         WF_ID = 'normal'
         WF_TITLE = 'Normal DCWorkflow'
@@ -3107,7 +3106,7 @@ def test_scripts_with_invalid_meta_type(self):
 
         Otherwise the previous script will be added for that script.
         """
-        from Products.DCWorkflow import exportimport
+        from .. import exportimport
 
         tool = self._importNormalWorkflow(
             'dcworkflow_scripts', 'DC Workflow testing scripts',
@@ -3126,7 +3125,7 @@ def test_scripts_by_meta_type(self):
         Constructors for meta_types other than those hard coded should
         be looked up.
         """
-        from Products.DCWorkflow import exportimport
+        from .. import exportimport
 
         tool = self._importNormalWorkflow(
             'dcworkflow_scripts', 'DC Workflow testing scripts',

src/Products/DCWorkflow/tests/test_guard.py

@@ -26,8 +26,8 @@
 from Products.CMFCore.tests.base.dummy import DummyTool
 from Products.CMFCore.WorkflowTool import WorkflowTool
 
-from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
-from Products.DCWorkflow.Guard import Guard
+from ..DCWorkflow import DCWorkflowDefinition
+from ..Guard import Guard
 
 
 class TestGuard(unittest.TestCase):

src/Products/DCWorkflow/tests/test_roles.py

@@ -18,8 +18,8 @@
 from OFS.Application import Application
 from OFS.Folder import Folder
 
-from Products.DCWorkflow.utils import modifyRolesForGroup
-from Products.DCWorkflow.utils import modifyRolesForPermission
+from ..utils import modifyRolesForGroup
+from ..utils import modifyRolesForPermission
 
 
 class RoleMapTests(unittest.TestCase):