Skip to content

Commit 4aa3fd4

Browse files
authored
Merge pull request #7112 from ic-hep/compinstaller
[8.0] fix: replaced deprecated importlib read_text function
2 parents 5e5b1af + 8b8ffad commit 4aa3fd4

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,9 @@ def getComponentCfg(
798798
for ext in extensions:
799799
cfgTemplateModule = f"{ext}.{system}System"
800800
try:
801-
cfgTemplate = importlib_resources.read_text(cfgTemplateModule, "ConfigTemplate.cfg")
801+
cfgTemplate = (
802+
importlib_resources.files(cfgTemplateModule).joinpath("ConfigTemplate.cfg").read_text()
803+
)
802804
except (ImportError, OSError):
803805
continue
804806
gLogger.notice("Loading configuration template from", cfgTemplateModule)
@@ -2128,7 +2130,7 @@ def installDatabase(self, dbName):
21282130
systemName = databases[filename]
21292131
moduleName = ".".join([extension, systemName, "DB"])
21302132
gLogger.debug(f"Installing {filename} from {moduleName}")
2131-
dbSql = importlib_resources.read_text(moduleName, filename)
2133+
dbSql = importlib_resources.files(moduleName).joinpath(filename).read_text()
21322134

21332135
# just check
21342136
result = self.execMySQL("SHOW STATUS")
@@ -2228,7 +2230,7 @@ def _createMySQLCMDLines(self, dbSql):
22282230
sourcedDBbFileName = line.split(" ")[1].replace("\n", "")
22292231
gLogger.info(f"Found file to source: {sourcedDBbFileName}")
22302232
module, filename = sourcedDBbFileName.rsplit("/", 1)
2231-
dbSourced = importlib_resources.read_text(module.replace("/", "."), filename)
2233+
dbSourced = importlib_resources.files(module.replace("/", ".")).joinpath(filename).read_text()
22322234
for lineSourced in dbSourced.split("\n"):
22332235
if lineSourced.strip():
22342236
cmdLines.append(lineSourced.strip())

0 commit comments

Comments
 (0)