convert getUtility in queryUtility

Author: cekk

Diff for: src/design/plone/contenttypes/patches/baseserializer.py

@@ -21,9 +21,8 @@
 from plone.restapi.serializer.dxcontent import SerializeToJson
 from Products.CMFCore.utils import getToolByName
 from zope.component import getMultiAdapter
-from zope.component import getUtility
+from zope.component import queryUtility
 from zope.i18n import translate
-from zope.interface.interfaces import ComponentLookupError
 
 
 original_serialize_to_json__call__ = SerializeToJson.__call__
@@ -40,18 +39,18 @@ def design_italia_serialize_to_json_call(self, version=None, include_items=True)
     if self.context.portal_type == "News Item":
         tipologia_notizia = getattr(self.context, "tipologia_notizia", "")
         if tipologia_notizia:
-            try:
-                taxonomy = getUtility(
-                    ITaxonomy, name="collective.taxonomy.tipologia_notizia"
-                )
+            taxonomy = queryUtility(
+                ITaxonomy, name="collective.taxonomy.tipologia_notizia"
+            )
+            if taxonomy:
                 taxonomy_voc = taxonomy.makeVocabulary(self.request.get("LANGUAGE"))
 
                 title = taxonomy_voc.inv_data.get(self.context.tipologia_notizia, None)
                 if title and title.startswith(PATH_SEPARATOR):
                     result["design_italia_meta_type"] = title.replace(
                         PATH_SEPARATOR, "", 1
                     )
-            except ComponentLookupError:
+            else:
                 result["design_italia_meta_type"] = tipologia_notizia
     return result
 

Diff for: src/design/plone/contenttypes/restapi/serializers/dxcontent.py

@@ -11,22 +11,20 @@
 )
 from plone.restapi.serializer.dxcontent import SerializeToJson as BaseSerializer
 from zope.component import adapter
-from zope.component import getUtility
+from zope.component import queryUtility
 from zope.i18n import translate
 from zope.interface import implementer
-from zope.interface.interfaces import ComponentLookupError
 
 
 class MetaTypeSerializer(object):
     def get_design_meta_type(self):
         ttool = api.portal.get_tool("portal_types")
         tipologia_notizia = getattr(self.context, "tipologia_notizia", "")
         if self.context.portal_type == "News Item" and tipologia_notizia:
-            try:
-                taxonomy = getUtility(
-                    ITaxonomy, name="collective.taxonomy.tipologia_notizia"
-                )
-            except ComponentLookupError:
+            taxonomy = queryUtility(
+                ITaxonomy, name="collective.taxonomy.tipologia_notizia"
+            )
+            if not taxonomy:
                 return tipologia_notizia
             taxonomy_voc = taxonomy.makeVocabulary(self.request.get("LANGUAGE"))
             if isinstance(tipologia_notizia, list):

Diff for: src/design/plone/contenttypes/restapi/serializers/summary.py

@@ -22,13 +22,12 @@
 )
 from zope.component import adapter
 from zope.component import getMultiAdapter
-from zope.component import getUtility
+from zope.component import queryUtility
 from zope.component import queryMultiAdapter
 from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.interface import implementer
 from zope.interface import Interface
-from zope.interface.interfaces import ComponentLookupError
 from zope.schema import getFieldsInOrder
 
 import logging
@@ -49,16 +48,16 @@ def get_taxonomy_information(field_name, context, res):
 
     request = getRequest()
 
-    try:
-        taxonomy = getUtility(ITaxonomy, name=f"collective.taxonomy.{field_name}")
-        taxonomy_voc = taxonomy.makeVocabulary(request.get("LANGUAGE"))
-    except ComponentLookupError:
+    taxonomy = queryUtility(ITaxonomy, name=f"collective.taxonomy.{field_name}")
+    if not taxonomy:
         # utility not found, return default
         if isinstance(value, list):
             res[field_name] = [{"token": token, "title": token} for token in value]
         else:
             res[field_name] = {"token": value, "title": value}
         return res
+
+    taxonomy_voc = taxonomy.makeVocabulary(request.get("LANGUAGE"))
     # il summary di un fullobject torna un value
     # il summary di un brain torna una lista (collective.taxonomy ha motivi per
     # fare così).
@@ -254,11 +253,10 @@ def get_design_meta_type(self):
         if self.context.portal_type == "News Item":
             tipologia_notizia = getattr(self.context, "tipologia_notizia", "")
             if tipologia_notizia:
-                try:
-                    taxonomy = getUtility(
-                        ITaxonomy, name="collective.taxonomy.tipologia_notizia"
-                    )
-                except ComponentLookupError:
+                taxonomy = queryUtility(
+                    ITaxonomy, name="collective.taxonomy.tipologia_notizia"
+                )
+                if not taxonomy:
                     # utility not found, return default
                     return tipologia_notizia
                 taxonomy_voc = taxonomy.makeVocabulary(self.request.get("LANGUAGE"))