getting closer to style guide. taking account of used version of p.a.…

…registry
plone · Feb 9, 2019 · 03febe6 · 03febe6
1 parent 56c8599
commit 03febe6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 49 deletions.
diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py
@@ -8,10 +8,11 @@
 
 
 try:
-    from Products.ResourceRegistries import JSRegistry
-    IS_PRODUCT_RESOURCE_REGISTRIES_INSTALLED = True
-except ImportError:
+    pkg_resources.get_distribution('Products.ResourceRegistries')
+except pkg_resources.DistributionNotFound:
     IS_PRODUCT_RESOURCE_REGISTRIES_INSTALLED = False
+else:
+    IS_PRODUCT_RESOURCE_REGISTRIES_INSTALLED = True
 
 try:
     from zope.app.cache.interfaces.ram import IRAMCache  # noqa F401

diff --git a/plone/app/upgrade/v42/final.py b/plone/app/upgrade/v42/final.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from plone.app.upgrade import IS_PRODUCT_RESOURCE_REGISTRIES_INSTALLED
 from plone.app.upgrade.utils import loadMigrationProfile
 from Products.CMFCore.utils import getToolByName
 
@@ -34,7 +35,8 @@ def to421(context):
 def to422(context):
     """4.2.1 -> 4.2.2
     """
-    loadMigrationProfile(context, 'profile-plone.app.upgrade.v42:to422')
+    if IS_PRODUCT_RESOURCE_REGISTRIES_INSTALLED:
+        loadMigrationProfile(context, 'profile-plone.app.upgrade.v42:to422')
 
 
 def to423(context):

diff --git a/plone/app/upgrade/v42/profiles/to_422/registry.xml b/plone/app/upgrade/v42/profiles/to_422/registry.xml
@@ -1,8 +1,7 @@
 <registry>
     <record
         interface="Products.ResourceRegistries.interfaces.settings.IResourceRegistriesSettings"
-        field="resourceBundlesForThemes"
-        condition="installed Products.ResourceRegistries">
+        field="resourceBundlesForThemes">
         <value purge="false">
             <element key="(default)">
                 <element>jquery</element>

diff --git a/plone/app/upgrade/v43/profiles/to_alpha2/registry.xml b/plone/app/upgrade/v43/profiles/to_alpha2/registry.xml
@@ -1,15 +1,4 @@
 <registry>
-    <record
-        interface="Products.ResourceRegistries.interfaces.settings.IResourceRegistriesSettings"
-        field="resourceBundlesForThemes"
-        condition="installed Products.ResourceRegistries">
-        <value purge="false">
-            <element key="(default)">
-                <element>jquery</element>
-                <element>default</element>
-            </element>
-        </value>
-    </record>
     <record name="plone.app.layout.globals.bodyClass.depth">
         <field type="plone.registry.field.Int">
             <title>Body class path depth</title>

diff --git a/plone/app/upgrade/v50/profiles/to_alpha3/registry.xml b/plone/app/upgrade/v50/profiles/to_alpha3/registry.xml
@@ -14,17 +14,6 @@
            prefix="plone" />
   <records interface="Products.CMFPlone.interfaces.IDateAndTimeSchema"
            prefix="plone" />
-  <record
-      interface="Products.ResourceRegistries.interfaces.settings.IResourceRegistriesSettings"
-      field="resourceBundlesForThemes"
-      condition="installed Products.ResourceRegistries">
-    <value purge="false">
-      <element key="(default)">
-        <element>jquery</element>
-        <element>default</element>
-      </element>
-    </value>
-  </record>
   <record name="Products.CMFPlone.i18nl10n.override_dateformat.Enabled">
     <field type="plone.registry.field.Bool">
       <title>Enabled</title>

diff --git a/plone/app/upgrade/v52/alphas.py b/plone/app/upgrade/v52/alphas.py
@@ -33,23 +33,6 @@ def migrate_gopipindex(context):
     manage_addGopipIndex(catalog, 'getObjPositionInParent')
 
 
-def remove_legacy_resource_registries(context):
-    """Remove portal_css and portal_javascripts."""
-    portal_url = getToolByName(context, 'portal_url')
-    portal = portal_url.getPortalObject()
-
-    tools_to_remove = [
-        'portal_css',
-        'portal_javascripts',
-    ]
-
-    # remove obsolete tools
-    tools = [t for t in tools_to_remove if t in portal]
-    portal.manage_delObjects(tools)
-
-    cleanUpToolRegistry(context)
-
-
 def rebuild_memberdata(context):
     # MemberData has changed radically, see plone/Products.PlonePAS#24
     # This results in a bug in upgraded sites: plone/Products.CMFPlone#2722
@@ -101,8 +84,8 @@ def fix_core_behaviors_in_ftis(context):
             fti.behaviors = tuple(behaviors)
 
 
-def remove_portal_tools(context):
-    """Remove some portal tools."""
+def remove_legacy_resource_registries(context):
+    """Remove portal_css and portal_javascripts."""
     portal_url = getToolByName(context, 'portal_url')
     portal = portal_url.getPortalObject()
 
@@ -125,7 +108,6 @@ def to52alpha1(context):
 
     cleanup_resources()
     migrate_gopipindex(context)
-    remove_legacy_resource_registries(context)
     rebuild_memberdata(context)
     fix_core_behaviors_in_ftis(context)
-    remove_portal_tools(context)
+    remove_legacy_resource_registries(context)