Merge 57b878b into 690300e

plone · Oct 30, 2020 · 9cfb55b · 9cfb55b
2 parents 690300e + 57b878b
commit 9cfb55b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/news/72.bugfix b/news/72.bugfix
@@ -0,0 +1 @@
+Before trying to load the zcml of plone.app.folder, double check if it is a real package or an alias provided by plone.app.upgrade
diff --git a/src/plone/app/testing/layers.py b/src/plone/app/testing/layers.py
@@ -75,9 +75,11 @@ class PloneFixture(Layer):
         try:
             # Since gopipindex moved to plone.folder only with Archetypes
             import plone.app.folder
-            products += (
-                ('plone.app.folder', {'loadZCML': True}, ),
-            )
+            # Prevent trying to load plone.app.folder if it is a module alias
+            if hasattr(plone.app.folder, "__file__"):
+                products += (
+                    ('plone.app.folder', {'loadZCML': True}, ),
+                )
         except ImportError:
             pass