diff --git a/Milter/config.py b/Milter/config.py index fc32e3a..1f1f4dc 100644 --- a/Milter/config.py +++ b/Milter/config.py @@ -14,10 +14,10 @@ class MilterConfigParser(ConfigParser): # which screws up iterating over all options in a section. # Worse, passing "defaults" with vars= overrides the config file! # So we roll our own defaults. - def get(self,sect,opt,raw=False,fallback=None): + def get(self,sect,opt,fallback=None,**kwds): if not self.has_option(sect,opt) and not fallback and opt in self.defaults: return self.defaults[opt] - return ConfigParser.get(self,sect,opt,raw=raw,fallback=fallback) + return ConfigParser.get(self,sect,opt,fallback=fallback,**kwds) def getlist(self,sect,opt): if self.has_option(sect,opt): diff --git a/testcfg.py b/testcfg.py index 0e19469..430a4e0 100644 --- a/testcfg.py +++ b/testcfg.py @@ -8,6 +8,8 @@ class ConfigTestCase(unittest.TestCase): socketname = cp.getdefault('srsmilter','socketname', '/var/run/milter/srsmilter') self.assertEqual(socketname,'/var/run/milter/srsmilter') + miltersrs = cp.getboolean('srsmilter','miltersrs') + self.assertFalse(miltersrs) def suite(): return unittest.makeSuite(ConfigTestCase,'test')