# HG changeset patch # User Pascal Volk # Date 1266808452 0 # Node ID 95be8f62bc0c4ee6a5e0f60b97a5458478236ea2 # Parent da07dd944ad1ebd5c4ef92abe95f7bc3a9af81db VMM/Config: moved Config.sections() to class LazyConfig. No longer import the ENCODING from VirtualMailManager, it's no longer required in the Config module. diff -r da07dd944ad1 -r 95be8f62bc0c VirtualMailManager/Config.py --- a/VirtualMailManager/Config.py Sat Feb 20 17:20:52 2010 +0000 +++ b/VirtualMailManager/Config.py Mon Feb 22 03:14:12 2010 +0000 @@ -41,7 +41,7 @@ ParsingError, RawConfigParser from cStringIO import StringIO# TODO: move interactive stff to cli -from VirtualMailManager import ENCODING, exec_ok, get_unicode, is_dir +from VirtualMailManager import exec_ok, get_unicode, is_dir from VirtualMailManager.constants.ERROR import CONF_ERROR from VirtualMailManager.Exceptions import VMMConfigException @@ -226,6 +226,10 @@ except(BadOptionError, NoSectionError, NoOptionError): return False + def sections(self): + """Returns an iterator object for all configuration sections.""" + return self._cfg.iterkeys() + class LazyConfigOption(object): """A simple container class for configuration settings. @@ -384,10 +388,6 @@ errmsg.write((u' %s\n') % option) raise VMMConfigException(errmsg.getvalue(), CONF_ERROR) - def sections(self): - """Returns an iterator object for all configuration sections.""" - return self._cfg.iterkeys() - def known_scheme(self, scheme): """Converts ``scheme`` to upper case and checks if is known by Dovecot (listed in VirtualMailManager.SCHEMES). @@ -405,7 +405,7 @@ return get_unicode(self.get(section, option)) def __chkCfg(self): - """Checks all section's options for settings w/o default values. + """Checks all section's options for settings w/o a default value. Returns ``True`` if everything is fine, else ``False``.""" errors = False