Merge pull request #59 from plone/optional_pafolder

Make plone.app.folder optional even in py2
plone · Feb 16, 2019 · d63d521 · d63d521
2 parents c7797bb + 70c58f7
commit d63d521
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/news/59.bugfix b/news/59.bugfix
@@ -0,0 +1 @@
+Make plone.app.folder a optional product for PloneFixture in py2
diff --git a/src/plone/app/testing/layers.py b/src/plone/app/testing/layers.py
@@ -69,9 +69,17 @@ class PloneFixture(Layer):
     if six.PY2:
         products += (
             ('Products.ExternalEditor', {'loadZCML': True}, ),
-            ('plone.app.folder', {'loadZCML': True}, ),
         )
 
+        try:
+            # Since gopipindex moved to plone.folder only with Archetypes
+            import plone.app.folder
+            products += (
+                ('plone.app.folder', {'loadZCML': True}, ),
+            )
+        except ImportError:
+            pass
+
     # try:
     #    import Products.PasswordResetTool
     #    products = products + (