Merge pull request #66 from plone/thet-zope4

Zope4
plone · Jan 29, 2016 · 558e507 · 558e507
2 parents d9b1239 + 4594d9f
commit 558e507
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,9 @@ New:
 
 Fixes:
 
-- *add item here*
+- Fix ``cleanUpProductRegistry`` to not break when ``Control_Panel`` cannot be found.
+  Fixes test failures with Zope 4.
+  [thet]
 
 
 1.3.20 (2016-01-08)

diff --git a/plone/app/upgrade/v40/alphas.py b/plone/app/upgrade/v40/alphas.py
@@ -385,12 +385,14 @@ def cleanUpSkinsTool(context):
 
 
 def cleanUpProductRegistry(context):
-    control = getattr(context, 'Control_Panel')
-    products = control.Products
-
-    # Remove all product entries
-    for name in products.keys():
-        products._delObject(name)
+    control = getattr(context, 'Control_Panel', None)
+    if control:
+        products = control.Products
+
+        # Remove all product entries
+        for name in products.keys():
+            products._delObject(name)
+    # else: pass  # Zope 4 doesn't have the Control_Panel anymore
 
 
 def migrateStaticTextPortlets(context):