Skip to content

Commit 3f1f345

Browse files
authored
Merge pull request ceph#59739 from sabaini/fix/ceph-volume-ep
[ceph-volume] fix importlib.metadata compat Reviewed-by: Guillaume Abrioux <[email protected]> Reviewed-by: John Mulligan <[email protected]>
2 parents 565295d + 8c78a22 commit 3f1f345

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/ceph-volume/ceph_volume/main.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,16 @@
1111
from importlib.metadata import entry_points
1212

1313
def get_entry_points(group: str): # type: ignore
14-
return entry_points().get(group, []) # type: ignore
14+
eps = entry_points()
15+
if hasattr(eps, 'select'):
16+
# New importlib.metadata uses .select()
17+
return eps.select(group=group)
18+
else:
19+
# Fallback to older EntryPoints that returns dicts
20+
return eps.get(group, []) # type: ignore
21+
1522
except ImportError:
23+
# Fallback to `pkg_resources` for older versions
1624
from pkg_resources import iter_entry_points as entry_points # type: ignore
1725

1826
def get_entry_points(group: str): # type: ignore

0 commit comments

Comments
 (0)