vmm: comparison VirtualMailManager/Config.py

equal deleted inserted replaced

-:32b4a39b5640
+:8dd3a107fd92
 option is not configured in a ini-like configuration file.
 `set()` differs from `RawConfigParser`'s `set()` method. `set()`
 takes the `section` and `option` arguments combined to a single
 string in the form "section.option".
 """
 def __init__(self):
 RawConfigParser.__init__(self)
 self._modified = False
 For a boolean True, the value must be set to '1', 'on', 'yes',
 'true' or True. For a boolean False, the value must set to '0',
 'off', 'no', 'false' or False.
 If the option has another value assigned this method will raise
 a ValueError.
 """
 # if the setting was modified it may be still a boolean value lets see
 tmp = self.get(section, option)
 if isinstance(tmp, bool):
 return tmp
 Else one of the following exceptions will be thrown:
 * `BadOptionError`
 * `NoSectionError`
 * `NoOptionError`
 """
 sect_opt = section_option.lower().split('.')
 # TODO: cache it
 if len(sect_opt) != 2:  # do we need a regexp to check the format?
 raise BadOptionError(_(u"Bad format: '%s' - expected: "
 return sect_opt
 def items(self, section):
 """returns an iterable that returns key, value ``tuples`` from
 the given ``section``.
 """
 if section in self._sections:  # check if the section was parsed
 sect = self._sections[section]
 elif not section in self._cfg:
 raise NoSectionError(section)
 `option` : string
 the configuration option in the form "section.option"
 Throws a `NoDefaultError`, if no default value was passed to
 `LazyConfigOption.__init__()` for the `option`.
 """
 section, option = self._get_section_option(option)
 try:
 return self._cfg[section][option].getter(section, option)
 except (NoSectionError, NoOptionError):
 def set(self, option, value):
 """Set the `value` of the `option`.
 Throws a `ValueError` if `value` couldn't be converted using
 `LazyConfigOption.cls`.
+"""
-"""
+# pylint: disable=W0221
-# pylint: disable-msg=W0221
 # @pylint: _L A Z Y_
 section, option = self._get_section_option(option)
 val = self._cfg[section][option].cls(value)
 if self._cfg[section][option].validate:
 val = self._cfg[section][option].validate(val)
 return section.lower() in self._cfg
 def has_option(self, option):
 """Checks if the option (section.option) is a known
 configuration option.
+"""
-"""
+# pylint: disable=W0221
-# pylint: disable-msg=W0221
 # @pylint: _L A Z Y_
 try:
 self._get_section_option(option)
 return True
 except(BadOptionError, NoSectionError, NoOptionError):
 """A simple container class for configuration settings.
 `LazyConfigOption` instances are required by `LazyConfig` instances,
 and instances of classes derived from `LazyConfig`, like the
 `Config` class.
 """
 __slots__ = ('__cls', '__default', '__getter', '__validate')
 def __init__(self, cls, default, getter, validate=None):
 """Creates a new `LazyConfigOption` instance.
 A method's name of `RawConfigParser` and derived classes, to
 get a option's value, e.g. `self.getint`.
 `validate` : NoneType or a callable
 None or any method, that takes one argument, in order to
 check the value, when `LazyConfig.set()` is called.
 """
 self.__cls = cls
 if not default is None:  # enforce the type of the default value
 self.__default = self.__cls(default)
 else:
 validate.__class__.__name__)
 self.__validate = validate
 @property
 def cls(self):
-"""The class of the option's value e.g. `str`, `unicode` or
+"""The class of the option's value e.g. `str`, `unicode` or `bool`."""
-`bool`.
-"""
 return self.__cls
 @property
 def default(self):
 """The option's default value, may be `None`"""
 Arguments:
 `filename` : str
 path to the configuration file
 """
 LazyConfig.__init__(self)
 self._cfg_filename = filename
 self._cfg_file = None
 self.__missing = {}
 'delete_directory': LCO(bool_t, False, self.getboolean),
 'directory_mode': LCO(int, 504, self.getint),
 'force_deletion': LCO(bool_t, False, self.getboolean),
 },
 'mailbox': {
-'folders': LCO(str, 'Drafts:Sent:Templates:Trash', self.get),
+'folders': LCO(str, 'Drafts:Sent:Templates:Trash',
+self.unicode),
 'format': LCO(str, 'maildir', self.get, check_mailbox_format),
-'root': LCO(str, 'Maildir', self.get),
+'root': LCO(str, 'Maildir', self.unicode),
 },
 'misc': {
 'base_directory': LCO(str, '/srv/mail', self.get, is_dir),
 'crypt_blowfish_rounds': LCO(int, 5, self.getint),
 'crypt_sha256_rounds': LCO(int, 5000, self.getint),
 def load(self):
 """Loads the configuration, read only.
 Raises a ConfigError if the configuration syntax is
 invalid.
 """
 try:
 self._cfg_file = open(self._cfg_filename, 'r')
 self.readfp(self._cfg_file)
 except (MissingSectionHeaderError, ParsingError), err:
 def __chk_cfg(self):
 """Checks all section's options for settings w/o a default
 value.
 Returns `True` if everything is fine, else `False`.
 """
 errors = False
 for section in self._cfg.iterkeys():
 missing = []
 for option, value in self._cfg[section].iteritems():

branch	v0.6.x
changeset 303	8dd3a107fd92
parent 301	e1d3f027dd64
child 304	df0f7b22540c