Merge "Use stdlib importlib.metadata where possible"

1 files changed, 9 insertions, 4 deletions

diff --git a/pbr/version.py b/pbr/version.py
index 658928e..37c7a9f 100644
--- a/pbr/version.py
+++ b/pbr/version.py
@@ -22,11 +22,16 @@ import itertools
 import operator
 import sys
 
-try:
-    import importlib_metadata
+# TODO(stephenfin): Remove this once we drop support for Python < 3.8
+if sys.version_info >= (3, 8):
+    from importlib import metadata as importlib_metadata
     use_importlib = True
-except ImportError:
-    use_importlib = False
+else:
+    try:
+        import importlib_metadata
+        use_importlib = True
+    except ImportError:
+        use_importlib = False
 
 
 def _is_int(string):