Skip to content

Commit 2d691af

Browse files
Replace pkg_resources with importlib resources.
1 parent 6a43ef3 commit 2d691af

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

bloom/generators/debian/generator.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
import collections
3636
import datetime
37+
import importlib.resources
3738
import io
3839
import json
3940
import os
40-
import pkg_resources
4141
import re
4242
import shutil
4343
import sys
@@ -126,22 +126,23 @@
126126

127127

128128
def __place_template_folder(group, src, dst, gbp=False):
129-
template_files = pkg_resources.resource_listdir(group, src)
129+
template_files = [os.path.basename(file)
130+
for file in importlib.resources.files(f'{group}.{src.replace("/", ".")}').iterdir()]
130131
# For each template, place
131132
for template_file in template_files:
132133
if not gbp and os.path.basename(template_file) == 'gbp.conf.em':
133134
debug("Skipping template '{0}'".format(template_file))
134135
continue
135136
template_path = os.path.join(src, template_file)
136137
template_dst = os.path.join(dst, template_file)
137-
if pkg_resources.resource_isdir(group, template_path):
138+
if importlib.resources.files(group).joinpath(template_path).is_dir():
138139
debug("Recursing on folder '{0}'".format(template_path))
139140
__place_template_folder(group, template_path, template_dst, gbp)
140141
else:
141142
try:
142143
debug("Placing template '{0}'".format(template_path))
143-
template = pkg_resources.resource_string(group, template_path)
144-
template_abs_path = pkg_resources.resource_filename(group, template_path)
144+
template = importlib.resources.files(group).joinpath(template_path).open().read()
145+
template_abs_path = importlib.resources.files(group).joinpath(template_path)
145146
except IOError as err:
146147
error("Failed to load template "
147148
"'{0}': {1}".format(template_file, str(err)), exit=True)

0 commit comments

Comments
 (0)