misc: remove support for loading extra modules (#73957)

debian/settings.py

@@ -54,4 +54,3 @@ TIME_ZONE = 'Europe/Paris'
 # SESSION_COOKIE_SECURE = True
 
 WCS_LEGACY_CONFIG_FILE = '/etc/wcs/wcs.cfg'
-WCS_EXTRA_MODULES = []

wcs/ctl/check_hobos.py

@@ -92,11 +92,6 @@ class CmdCheckHobos(Command):
         from .. import publisher
 
         self.base_options = base_options
-        if sub_options.extra:
-            if not self.config.has_section('extra'):
-                self.config.add_section('extra')
-            for i, extra in enumerate(sub_options.extra):
-                self.config.set('extra', 'cmd_line_extra_%d' % i, extra)
         publisher.WcsPublisher.configure(self.config)
         pub = publisher.WcsPublisher.create_publisher(register_tld_names=False)
 

wcs/ctl/hobo_notify.py

@@ -33,11 +33,6 @@ class CmdHoboNotify(Command):
 
     def execute(self, base_options, sub_options, args):
         self.base_options = base_options
-        if sub_options.extra:
-            if not self.config.has_section('extra'):
-                self.config.add_section('extra')
-            for i, extra in enumerate(sub_options.extra):
-                self.config.set('extra', 'cmd_line_extra_%d' % i, extra)
 
         notification = self.load_notification(args)
         if not self.check_valid_notification(notification):

wcs/publisher.py

@@ -120,9 +120,6 @@ class WcsPublisher(QommonPublisher):
 
     @classmethod
     def configure(cls, config):
-        if config.has_section('extra'):
-            for dummy, directory in config.items('extra'):
-                cls.register_extra_dir(directory)
         if config.has_option("main", "app_dir"):
             cls.APP_DIR = config.get("main", "app_dir")
         if config.has_option("main", "data_dir"):
@@ -593,4 +590,3 @@ class WcsPublisher(QommonPublisher):
 
 
 set_publisher_class(WcsPublisher)
-WcsPublisher.register_extra_dir(os.path.join(os.path.dirname(__file__), 'extra'))

wcs/qommon/__init__.py

@@ -173,11 +173,6 @@ class AppConfig(django.apps.AppConfig):
         config = configparser.ConfigParser()
         if settings.WCS_LEGACY_CONFIG_FILE:
             config.read(settings.WCS_LEGACY_CONFIG_FILE)
-        if hasattr(settings, 'WCS_EXTRA_MODULES') and settings.WCS_EXTRA_MODULES:
-            if not config.has_section('extra'):
-                config.add_section('extra')
-            for i, extra in enumerate(settings.WCS_EXTRA_MODULES):
-                config.set('extra', 'cmd_line_extra_%d' % i, extra)
 
         threading.Thread = TenantAwareThread
         threading._DummyThread = _DummyThread

wcs/qommon/ctl.py

@@ -40,7 +40,6 @@ class Command:
         options = options or []
         self.config = configparser.ConfigParser()
         self.options = options + [
-            make_option('--extra', metavar='DIR', action='append', dest='extra', default=[]),
             make_option('--app-dir', metavar='DIR', action='store', dest='app_dir', default=None),
             make_option('--data-dir', metavar='DIR', action='store', dest='data_dir', default=None),
         ]
@@ -63,11 +62,6 @@ class Command:
             self.config.set("main", "app_dir", sub_options.app_dir)
         if sub_options.data_dir:
             self.config.set("main", "data_dir", sub_options.data_dir)
-        if sub_options.extra:
-            if not self.config.has_section('extra'):
-                self.config.add_section('extra')
-            for i, extra in enumerate(sub_options.extra):
-                self.config.set("extra", "cmd_line_extra_%d" % i, extra)
         return self.execute(base_options, sub_options, args)
 
     def parse_args(self, args):

wcs/qommon/publisher.py

@@ -20,7 +20,6 @@ import collections
 import configparser
 import datetime
 import hashlib
-import importlib
 import inspect
 import io
 import json
@@ -709,7 +708,6 @@ class QommonPublisher(Publisher):
         if cls._initialized:
             return
         cls._initialized = True
-        cls.load_extra_dirs()
 
     @classmethod
     def create_publisher(cls, **kwargs):
@@ -735,31 +733,6 @@ class QommonPublisher(Publisher):
         self._app_logger = None
         self.init_publisher_substitutions(self.get_request())
 
-    extra_dirs = None
-
-    @classmethod
-    def register_extra_dir(cls, dir):
-        if not cls.extra_dirs:
-            cls.extra_dirs = []
-        cls.extra_dirs.append(dir)
-
-    @classmethod
-    def load_extra_dirs(cls):
-        for extra_dir in cls.extra_dirs or []:
-            if not os.path.exists(extra_dir):
-                continue
-            sys.path.append(extra_dir)
-            for filename in os.listdir(extra_dir):
-                if not filename.endswith('.py'):
-                    continue
-                modulename = filename[:-3]
-                spec = importlib.util.spec_from_file_location(modulename, os.path.join(extra_dir, filename))
-                module = importlib.util.module_from_spec(spec)
-                try:
-                    spec.loader.exec_module(module)
-                except Exception as e:
-                    print('failed to load extra module: %s (%s)' % (modulename, e), file=sys.stderr)
-
     translation_domains = None
 
     @classmethod