Use backport module explicitly.

The backport module for importlib_resources doesn't shadow the standard
library import.resources thus we need to import conditionally based on
the current Python / standard library version.

Author: nuclearsandwich

bloom/generators/debian/generator.py

@@ -34,7 +34,6 @@
 
 import collections
 import datetime
-import importlib.resources
 import io
 import json
 import os
@@ -89,6 +88,12 @@
 from bloom.util import get_rfc_2822_date
 from bloom.util import maybe_continue
 
+if sys.version_info[0:2] < (3, 10):
+    import importlib_resources
+else:
+    import importlib.resources as importlib_resources
+
+
 try:
     from catkin_pkg.changelog import get_changelog_from_path
     from catkin_pkg.changelog import CHANGELOG_FILENAME
@@ -127,22 +132,22 @@
 
 def __place_template_folder(group, src, dst, gbp=False):
     template_files = [os.path.basename(file)
-                      for file in importlib.resources.files(f'{group}.{src.replace("/", ".")}').iterdir()]
+                      for file in importlib_resources.files(f'{group}.{src.replace("/", ".")}').iterdir()]
     # For each template, place
     for template_file in template_files:
         if not gbp and os.path.basename(template_file) == 'gbp.conf.em':
             debug("Skipping template '{0}'".format(template_file))
             continue
         template_path = os.path.join(src, template_file)
         template_dst = os.path.join(dst, template_file)
-        if importlib.resources.files(group).joinpath(template_path).is_dir():
+        if importlib_resources.files(group).joinpath(template_path).is_dir():
             debug("Recursing on folder '{0}'".format(template_path))
             __place_template_folder(group, template_path, template_dst, gbp)
         else:
             try:
                 debug("Placing template '{0}'".format(template_path))
-                template = importlib.resources.files(group).joinpath(template_path).open().read()
-                template_abs_path = importlib.resources.files(group).joinpath(template_path)
+                template = importlib_resources.files(group).joinpath(template_path).open().read()
+                template_abs_path = importlib_resources.files(group).joinpath(template_path)
             except IOError as err:
                 error("Failed to load template "
                       "'{0}': {1}".format(template_file, str(err)), exit=True)

bloom/generators/rpm/generator.py

@@ -34,7 +34,6 @@
 
 import collections
 import datetime
-import importlib.resources
 import io
 import json
 import os
@@ -83,6 +82,11 @@
 from bloom.util import execute_command
 from bloom.util import maybe_continue
 
+if sys.version_info[0:2] < (3, 10):
+    import importlib_resources
+else:
+    import importlib.resources as importlib_resources
+
 try:
     import rosdistro
 except ImportError as err:
@@ -103,19 +107,19 @@
 
 def __place_template_folder(group, src, dst, gbp=False):
     template_files = [os.path.basename(file)
-                      for file in importlib.resources.files(f'{group}.{src.replace("/", ".")}').iterdir()]
+                      for file in importlib_resources.files(f'{group}.{src.replace("/", ".")}').iterdir()]
     # For each template, place
     for template_file in template_files:
         template_path = os.path.join(src, template_file)
         template_dst = os.path.join(dst, template_file)
-        if importlib.resources.files(group).joinpath(template_path).is_dir():
+        if importlib_resources.files(group).joinpath(template_path).is_dir():
             debug("Recursing on folder '{0}'".format(template_path))
             __place_template_folder(group, template_path, template_dst, gbp)
         else:
             try:
                 debug("Placing template '{0}'".format(template_path))
-                template = importlib.resources.files(group).joinpath(template_path).open().read()
-                template_abs_path = importlib.resources.files(group).joinpath(template_path)
+                template = importlib_resources.files(group).joinpath(template_path).open().read()
+                template_abs_path = importlib_resources.files(group).joinpath(template_path)
             except IOError as err:
                 error("Failed to load template "
                       "'{0}': {1}".format(template_file, str(err)), exit=True)