Merge pull request #75 from plone/4126-replace-pkg-resources

Replace pkg_resources
plone · Mar 1, 2025 · e563170 · e563170
2 parents e5b06bf + eeeec82
commit e563170
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/news/4126.bugfix b/news/4126.bugfix
@@ -0,0 +1 @@
+Replace `pkg_resources` with `importlib.metadata` @gforcada
diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py
@@ -3,6 +3,8 @@
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from html import escape
+from importlib.metadata import distribution
+from importlib.metadata import PackageNotFoundError
 from operator import itemgetter
 from plone.app.content.browser.folderfactories import _allowedTypes
 from plone.app.contentmenu import PloneMessageFactory as _
@@ -37,16 +39,15 @@
 from zope.interface import implementer
 
 import json
-import pkg_resources
 import plone.locking  # noqa: F401
 
 
 PMF = _  # used for dynamic messages we don't want to extract
 
 try:
-    pkg_resources.get_distribution("Products.CMFPlacefulWorkflow")
+    distribution("Products.CMFPlacefulWorkflow")
     from Products.CMFPlacefulWorkflow.permissions import ManageWorkflowPolicies
-except pkg_resources.DistributionNotFound:
+except PackageNotFoundError:
     from Products.CMFCore.permissions import ManagePortal as ManageWorkflowPolicies
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Replace `pkg_resources` with `importlib.metadata` @gforcada