Merge pull request #34 from plone/do3cc_bla

Alternative solution to the dependency issue WARNING below
plone · Oct 1, 2015 · f917b60 · f917b60
2 parents 9c28d8a + 5318342
commit f917b60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
@@ -140,7 +140,12 @@ def getNonInstallableProducts(self):
 
 # To solve the __iro__ problem because CMFPlacefulWorkflow interfaces changed on 1.6.1
 try:
+    pkg_resources.get_distribution('Products.CMFPlacefulWorkflow')
     from Products.CMFPlacefulWorkflow.interfaces import portal_placeful_workflow
+except pkg_resources.DistributionNotFound:
+    # No package in this environment requires CMFPlacefulWorkflow,
+    # so no patching necessary
+    pass
 except:
     from Products.CMFPlacefulWorkflow import interfaces
     alias_module('Products.CMFPlacefulWorkflow.interfaces.portal_placeful_workflow', interfaces)
diff --git a/setup.py b/setup.py
@@ -61,7 +61,6 @@
         'Products.CMFDiffTool',
         'Products.CMFEditions',
         'Products.CMFFormController',
-        'Products.CMFPlacefulWorkflow',
         'Products.CMFQuickInstallerTool',
         'Products.CMFUid',
         'Products.DCWorkflow',