diff roundup/configuration.py @ 6325:1a15089c2e49 issue2550923_computed_property

Merge trunk into branch
author John Rouillard <rouilj@ieee.org>
date Sat, 06 Feb 2021 20:15:26 -0500
parents 778a9f455067
children 6a6b4651be1f
line wrap: on
line diff
--- a/roundup/configuration.py	Fri Jan 15 16:34:30 2021 -0500
+++ b/roundup/configuration.py	Sat Feb 06 20:15:26 2021 -0500
@@ -9,7 +9,6 @@
 # used here instead of try/except.
 import sys
 import getopt
-import imp
 import logging, logging.config
 import os
 import re
@@ -264,13 +263,6 @@
         if config.has_option(self.section, self.setting):
             self.set(config.get(self.section, self.setting))
 
-    def load_pyconfig(self, config):
-        """Load value from old-style config (python module)"""
-        for _name in self.aliases:
-            if hasattr(config, _name):
-                self.set(getattr(config, _name))
-                break
-
 
 class BooleanOption(Option):
 
@@ -1850,7 +1842,7 @@
         if os.path.isfile(os.path.join(home_dir, self.INI_FILE)):
             self.load_ini(home_dir)
         else:
-            self.load_pyconfig(home_dir)
+            raise NoConfigError(home_dir)
         self.init_logging()
         self.ext = UserConfig(os.path.join(home_dir, "extensions"))
         self.detectors = UserConfig(os.path.join(home_dir, "detectors"))
@@ -1862,34 +1854,6 @@
             config_defaults.update(defaults)
         Config.load_ini(self, home_dir, config_defaults)
 
-    def load_pyconfig(self, home_dir):
-        """Set options from config.py file in given home_dir directory"""
-        # try to locate and import the module
-        _mod_fp = None
-        try:
-            try:
-                _module = imp.find_module(self.PYCONFIG, [home_dir])
-                _mod_fp = _module[0]
-                _config = imp.load_module(self.PYCONFIG, *_module)
-            except ImportError:
-                raise NoConfigError(home_dir)
-        finally:
-            if _mod_fp is not None:
-                _mod_fp.close()
-        # module loaded ok.  set the options, starting from HOME
-        self.reset()
-        self.HOME = home_dir
-        for _option in self.items():
-            _option.load_pyconfig(_config)
-        # backward compatibility:
-        # SMTP login parameters were specified as a tuple in old style configs
-        # convert them to new plain string options
-        _mailuser = getattr(_config, "MAILUSER", ())
-        if len(_mailuser) > 0:
-            self.MAIL_USERNAME = _mailuser[0]
-        if len(_mailuser) > 1:
-            self.MAIL_PASSWORD = _mailuser[1]
-
     # in this config, HOME is also known as TRACKER_HOME
     def __getitem__(self, name):
         if name == "TRACKER_HOME":

Roundup Issue Tracker: http://roundup-tracker.org/