Skip to content

Commit 6fc6e11

Browse files
gforcadaicemac
andauthored
Drop pkg resources usage (#84)
Co-authored-by: Michael Howitz <[email protected]>
1 parent 964c217 commit 6fc6e11

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

CHANGES.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
7.3 (unreleased)
66
================
77

8-
- Nothing changed yet.
9-
8+
- Replace `pkg_resources` with `importlib.metadata`.
109

1110
7.2 (2024-12-19)
1211
================

docs/conf.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
# sys.path.insert(0, os.path.abspath('.'))
2121
import os
2222
import sys
23-
24-
import pkg_resources
23+
from importlib.metadata import distribution
2524

2625

2726
sys.path.append(os.path.abspath('../src'))
28-
rqmt = pkg_resources.require('zope.publisher')[0]
27+
rqmt = distribution("zope.publisher")
2928

3029
# -- General configuration ------------------------------------------------
3130

src/zope/publisher/paste.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
#
1313
##############################################################################
1414

15-
import pkg_resources
15+
import sys
1616

1717
import zope.publisher.browser
1818
import zope.publisher.http
1919
import zope.publisher.publish
2020

2121

22+
PY39 = sys.version_info[0:2] < (3, 10)
23+
2224
browser_methods = {'GET', 'HEAD', 'POST'}
2325

2426

@@ -68,4 +70,13 @@ def get_egg(name, group):
6870
else:
6971
egg, entry_point = name, 'default'
7072

71-
return pkg_resources.load_entry_point(egg, group, entry_point)
73+
if PY39:
74+
import pkg_resources
75+
76+
return pkg_resources.load_entry_point(egg, group, entry_point)
77+
else:
78+
from importlib.metadata import entry_points
79+
80+
(entry_point,) = entry_points().select(group=group, name=entry_point)
81+
82+
return entry_point.load()

0 commit comments

Comments
 (0)