Skip to content

Commit

Permalink
Stop using "imp" module
Browse files Browse the repository at this point in the history
Fixes broken build on Fedora Rawhide.

The deprecated importlib API has been removed from Python 3.12,
see python/cpython#98040.

Addressing:

Traceback (most recent call last):
  File "/builddir/build/BUILD/scap-security-guide-0.1.69/build-scripts/build_templated_content.py", line 9, in <module>
    import ssg.templates
  File "/builddir/build/BUILD/scap-security-guide-0.1.69/ssg/templates.py", line 5, in <module>
    import imp
ModuleNotFoundError: No module named 'imp'
  • Loading branch information
jan-cerny committed Jul 11, 2023
1 parent 1b841ca commit 9fd541b
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions ssg/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from __future__ import print_function

import os
import imp
import glob

from collections import namedtuple
Expand Down Expand Up @@ -38,6 +37,24 @@
TEMPLATE_YAML_FILE_NAME = "template.yml"


def load_module(module_name, module_path):
try:
# Python 2.7
from imp import load_source
return load_source(module_name, module_path)
except ImportError:
# https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
import importlib
spec = importlib.util.spec_from_file_location(module_name, module_path)
if not spec:
raise ValueError("Error loading '%s' module" % module_path)
module = importlib.util.module_from_spec(spec)
if not spec.loader:
raise ValueError("Error loading '%s' module" % module_path)
spec.loader.exec_module(module)
return module


class Template:
def __init__(self, templates_root_directory, name):
self.langs = []
Expand Down Expand Up @@ -83,8 +100,8 @@ def preprocess(self, parameters, lang):
def _preprocess_with_template_module(self, parameters, lang):
if self.preprocessing_file_path is not None:
unique_dummy_module_name = "template_" + self.name
preprocess_mod = imp.load_source(unique_dummy_module_name,
self.preprocessing_file_path)
preprocess_mod = load_module(
unique_dummy_module_name, self.preprocessing_file_path)
if not hasattr(preprocess_mod, "preprocess"):
msg = (
"The '{name}' template's preprocessing file {preprocessing_file} "
Expand Down

0 comments on commit 9fd541b

Please sign in to comment.