Skip to content

Commit 26227b5

Browse files
authored
Merge pull request #189 from plone/drop-pkg-resources-60
chore: drop pkg_resources usage
2 parents 911a60e + 56c62af commit 26227b5

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

news/4126.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Replace `pkg_resources` with `importlib.metadata` @gforcada

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[build-system]
2+
requires = ["setuptools>=68.2,<75.8.0"]
3+
14
[tool.towncrier]
25
filename = "CHANGES.rst"
36
directory = "news/"

src/plone/volto/setuphandlers.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from importlib import import_module
3+
from importlib.metadata import distribution
4+
from importlib.metadata import PackageNotFoundError
35
from plone import api
46
from plone.dexterity.interfaces import IDexterityFTI
57
from plone.volto.bbb import get_installer
@@ -13,17 +15,16 @@
1315

1416
import json
1517
import logging
16-
import pkg_resources
1718
import transaction
1819

1920

2021
try:
21-
pkg_resources.get_distribution("plone.app.multilingual")
22+
distribution("plone.app.multilingual")
2223
from plone.app.multilingual.browser.setup import SetupMultilingualSite
2324
from plone.app.multilingual.setuphandlers import enable_translatable_behavior
2425

2526
HAS_MULTILINGUAL = True
26-
except pkg_resources.DistributionNotFound:
27+
except PackageNotFoundError:
2728
HAS_MULTILINGUAL = False
2829

2930
PLONE_6 = getattr(import_module("Products.CMFPlone.factory"), "PLONE60MARKER", False)

0 commit comments

Comments
 (0)