Skip to content

Commit a72c62f

Browse files
authored
Support Python 3.8-provided importlib.metadata (#585)
The importlib_metadata package is a backport of the importlib.metadata module from Python 3.8. Fedora (and possibly others) no longer package importlib_metadata because they ship Python versions which have the functionality built-in. Signed-off-by: Scott K Logan <[email protected]>
1 parent f6c4a5b commit a72c62f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

ros2cli/ros2cli/entry_points.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
from collections import defaultdict
1717
import logging
1818

19-
import importlib_metadata
19+
try:
20+
import importlib.metadata as importlib_metadata
21+
except ModuleNotFoundError:
22+
import importlib_metadata
2023

2124
"""
2225
The group name for entry points identifying extension points.

ros2doctor/ros2doctor/api/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
from typing import Set
1717
from typing import Tuple
1818

19-
import importlib_metadata
19+
try:
20+
import importlib.metadata as importlib_metadata
21+
except ModuleNotFoundError:
22+
import importlib_metadata
2023

2124
from ros2doctor.api.format import doctor_warn
2225

0 commit comments

Comments
 (0)