merged changes from default(8c4df3dd2d2c)

vmm: minimal cleanups.

VMM: VirtualMailManager.__pwhash() added support for 'doveadm pw'. dovecotpw was replaced by `doveadm pw` in Dovecot v2.0. To use doveadm instead of dovecotpw use the following settings in vmm.cfg: [bin] dovecotpw = /path/to/doveadm [misc] dovecotvers = 20

man: updated configuration manual pages (maildir.* -> mailbox.*).

vmm.cfg: renamed maildir.folders to mailbox.folders. maildir.name was removed. new: mailbox.format, in order to support all mailbox formats from Dovecot. Maildir is the default format. Adjusted VirtualMailManager/Config and update_config.py to the changes mentioned above.

VMM/maillocation: MailLocation.__init__(): take a 'format' name, instead of a 'directory' name. - added function known_format() to the module. VMM/Account: Adjusted to above changes.

VMM/Account: Adjusted to changes in maillocation.MailLocation. VMM/maillocation: Class MailLocation added missing property `mid`. Added new error to VMM/constants/ERROR and doc/source/vmm_constants_error

VMM/maillocation: rewrote MailLocation class. Renamed MailLocation.py to maillocation.py.

VMM/Transport: reworked Transport class. Use assertions for argument checks. Removed methods getID() and getTransport(). This values are now accessible through the read-only attributes id and transport. VMM/{Account,Domain}: adjusted to modifications in Transport class. A few code cleanups.

VMM/pycompat: added function any() for Python 2.4

replaced some "for x in list …"

VMM/Domain: get_gid() return 0 instead of raising an Exception, if the domain wasn't found in the database.

VMM/Alias: renamed Alias.add_destination() to add_destinations(). Now it's possible to add one ore more destinations to the alias with a single method call. VMM/Handler: adjusted Handler.aliasAdd() to the API changes of the Alias class. Also use get_gid from the Domain module to get the gid of a domain. We don't need complete Domain object, only the gid. Handler.getWarnings(): no longer return the __warnings list. Return a copy instead and empty the Handler.__warnings list.

doc: Added the alias documentation.

VMM/pycompat: added to the repository. Provides all() for Py24.

VMM/EmailAddress: implemented EmailAddress.__hash__(). So we can have a set() of EmailAddress instances.

VMM/cli: small optimizations in the functions w_std() and w_err()

Moved VirtualMailManager/Exceptions to VirtualMailManager/errors. Renamed VMM*Exception classes to *Error. No longer add the attribute 'message' to VMMError if it doesn't exist, like in Python 2.4. It has been deprecated as of Python 2.6. Also removed the methods code() and msg(), the values are now accessible via the attributes 'code' and 'msg'.

PEP-8-ified the work of the last days. Renamed methods in class Alias: addDestination() -> add_destination() delDestination() -> del_destination() getDestinations() -> get_destinations() Renamed methods in class Relocated: setDestination() -> set_destination() getInfo() -> get_info() Renamed VMM/constants/VERSION.py -> VMM/constants/version.py Adjusted relevant parts of the documentation.

VMM/Exceptions: use the inherited CTor in all VMM*Exception classes.

VMM:/{Alias,EmailAddress,Relocated}: use assertions for argument checks.

doc: extended documentation.

VMM/Config: LazyConfig.getboolean(), convert the value in our getboolean. So RawConfigParser hasn't to do the whole get() stuff again.

Added 'doc/build' to the ignored files.

VMM{/Config}: reduced docstrings. Added doc to the repository.

VMM: removed unneeded/duplicated regular expression definitions

VMM/Config: moved Config.sections() to class LazyConfig. No longer import the ENCODING from VirtualMailManager, it's no longer required in the Config module.

VMM/Config: renamed LazyConfig's get_boolean() to getboolean(). VMM/cli/Config: import required ConfigParser.RawConfigParser.

VMM/cli: added __init__.py to the repository.

VMM/{,cli/}Config: fixed imports. Small code cleanups and cosmetic.

VMM/Alias: small code cleanups and cosmetic.

VMM/Relocated: small code cleanups and cosmetic.

VMM/Config: LazyConfigOption.__init__() cast 'default' to 'cls'. If the default value is not None, make sure it has the proper type.

VMM/Config: attributes of class LazyConfigOption are read-only now. Some small code cleanups.

VMM: renamed function chk_domainname() -> check_domainname(). Moved EmailAddress.check_localpart() -> VirtualMailManager.check_localpart(). Some small code cleanups in class EmailAddress.

VMM/Domain: added function get_gid() to the Domain module. We don't need to load all the domain related information from the database, when we need only the GID of a domain. For example in the Alias or Relocated classes.

VMM/{Relocated,Handler}: reworked Relocated class, adjusted Handler.

VMM/{Alias,Handler}: reworked Alias class, adjusted Handler class. Handler: - attribute _dbh is no longer private, the VMM/cli/Handler uses it also. - adjusted to changes in Alias and EmailAddress classes.

VMM/EmailAddress: reworked class EmailAddress again. The attributes domainname and localpart are now read-only.

VMM/EmailAddress: reworked once more. - moved EmailAddress.__chkLocalpart() -> __module__.check_localpart() - renamed EmailAddress.__chkAddress() -> EmailAddress._chk_address() - attributes domainname and localpart are no longer protected - added missing doc strings.

VMM/EmailAddress: rework EmailAddress class.

VMM/Handler: fixed a SyntaxError. Oops

VMM/Handler: __mailDirMake() add warning for skipped mailboxes. - domainInfo() removed old deprecated warning. - fixed PEP8 warnings.

VMM/{,cli/}Handler: reverted most of cs cf1b5f22dbd2 added a cli handler. Moved the interactive stuff from VMM/Handler to the derived VMM/cli/Handler.

moved VMM/cli/CliConfig to VMM/cli/Config

VMM/Handler: __init__ accepts now a config_type ('default'||'cli'). - fixed syntax errors, introduced with the last commit. VMM/Config: added Config.configure() -> NotImplementedError. VMM/__init__: install gettext global, everything depends on it.

VMM/{,cli/Cli}Config: Moved interactive stuff to new CliConfig class. Renamed Config.getsections() to Config.sections(). Small cosmetics.

moved VMM/cli/handler to VMM/Handler

VMM/*: Moved some methods from classes to modules __init__. - Adjusted many import statements. - Small adjustments and whitespace cosmetics in Config.py

moved VMM/VMM to VMM/cli/handler

vmm: reworked subcommand/arguments mapping.

VMM/VMM: Allow version/help subcommands even with missing configuration options.

update_config: do not add options w/ default values. remove config.done

VMM/Config: dropped option config.done

man: updated documentation …

po: Quick refresh - for documentation purpose.

man/{,de/}man5: added a note about how to use default settings. man/de/man5: s/Abschnitt*/Sektion*/g

man: Added used default values to manual.

VMM/VMM: allow configure subcommand also with missing settings. Removed method VirtualMailManager.setupIsDone() VMM/Config: Config.load() added 'finally' clause.

VMM/Config: reworked configuration handling. Implemented LazyConfig(RawConfigParser) and LazyConfigOption(object) Rewrote Config class: * use default values and added some validation stuff * removed attributes: __VMMsections and __changes * replaced methods __chkSections() and __chkOptions() with __chkCfg VMM/VMM: Adjusted to reworked Config class. * removed attribute __cfgSections * removed methods: cfgGetBoolean(), cfgGetInt(), cfgGetString() * added methods: cfgDget(), cfgPget(), cfgSet() VMM/__init__: added function get_unicode() vmm: Adjusted to replaced methods in VMM/VMM.

branch merge

VMM/Config: Fixed error handling of missing sections in vmm.cfg.

VMM/Config: Fixed error handling of missing sections in vmm.cfg.

man: reworded some parts.

man: updated man/{de/,}man5/vmm.cfg.5, using reStructuredText now

vmm.cfg: a few re-renamed configuration options. old new -------------------------------------------------- account.password_len -> account.password_length domain.force_del -> domain.force_deletion misc.base_dir -> misc.base_directory misc.dovecot_vers -> misc.dovecot_version

update_config.py: adjusted functions stuff to renamed settings. Finally renamed update_config_0.4.x-0.5.py to update_config.py - no more version information in the filename. *.sh: removed .svn directory exclusion from find command.

vmm.cfg: dealt with the most overdue section/option renaming. Added new options. Details: old new ------------------------------------------------------------ domdir.mode -> domain.directory_mode domdir.delete -> domain.delete_directory domdir.base -> misc.base_dir domdir -> _section domdir deleted_ maildir.mode -> account.directory_mode maildir.diskusage -> account.disk_usage maildir.delete -> account.delete_directory misc.forcedel -> domain.force_del misc.passwdscheme -> misc.password_scheme misc.dovecotvers -> misc.dovecot_vers services.smtp -> account.smtp services.pop3 -> account.pop3 services.imap -> account.imap services.sieve -> account.sieve services -> _section services deleted_ _NEW_.random_password -> account.random_password _NEW_.password_len -> account.password_len _NEW_.auto_postmaster -> domain.auto_postmaster

INSTALL: Adapted pgsql configuration steps to that in the wiki. (Closes: #2922030)

*.sh: Added --force option to python setup.py install call. upgrade.sh: Removed old cleanup code.

setup.py: Fixed a UserWarning that may occur with older Python.

Updated copyright notices to include the year 2010. Also corrected the name of the copyright holder and updated the e-mail address.

Removed the svn-ish tag trunk

*.pgsql: moved to pgsql/

Moved Postfix PostgreSQL client configuration files into the postfix directory.

VMM: Don't prompt endless for a password. Stop after 3rd failure.

vmm: plan_a_b s/address/object/

Added comments for the Translation Project. Updated PO template.

Fixed some grammar errors and typos. (Reported by Clytie Siddall)

Added the Vietnamese translation to the repository. Many thanks to Clytie Siddall from the Translation Project for the work.

Updated Dutch translation (translated by Erwin Poeze).

Ignore unsupported locale setting and silently fall back to 'C'.

Added tag vmm-0.5.2 for changeset 3e972996da7f

Released vmm-0.5.2

Improved error handling in vmm's {alias}domaininfo.

Added the Dutch translation to the repository. Many thanks to Erwin Poeze from the Translation Project for the work.

Improved error handling in vmm's {user,alias,relocated}info. Removed some comparisons of string and Unicode.

Alias.__init__(): Check really if the given address is not used.

Sort alias addresses in Account.getAliases() / vmm userinfo.

Small optimizations in Account.getAliases() and Alias.getInfo().

Code cleanup/optimization in VMM's idn2ascii() and ace2idna().

Reduced the mixing/concatenating of str and unicode objects. Optimized list generation in Domain class.

Small optimization in w_std()/w_err() 'avoid the dot'.

Code cleanup/optimization in VirtualMailManager's __getSalt().

Added the French translation to the repository. Many thanks to Dimitri Duc from the Translation Project for the work.

Reorganized module import. Dropped the import of constants.VERSION, when it wasn't really needed. Centralized the import of os, re and locale in VirtualMailManager/__init__.py. Also moved w_std() and w_err() from vmm to the __init__.py.

Don't crash if the date format not only consists of ASCII signs. Added also the u stringprefix to translatable strings where it was missing.

Reorganized imports, eliminated a potential UnicodeEncodeError. Removed double definition of function w_std() in Config class.

Updated documentation

Fixed a Python2.4.4 SyntaxError

Replaced angle quotes by quotation marks.

Added a deprecated warning for managesieve. Updated translation.

Updated documentation

avoid error message if used with version 0.5.2

Updated translation.

Converted VirtualMailManager and Postconf to new-style classes. A few small cleanups.

Updated documentation

removed GRANT statement. It's mentioned in UPGRADE

Removed the currently not needed WHERE clause from the VIEW.

Added create SQL scripts for Dovecot v1.2.x

Added update SQL scripts for Dovecot v1.2.x

Converted to new-style class, added __slots__.

Converted to new-style class, added __slots__, updated queries. Use the _uid attribute in queries whenever it is possible.

Comments updated.

Small code cleanups (replaced dir+'/'+file by os.path.join()).

Rewrote upgrade script and config update script

Updated long_description, download_url and platforms. Dropped VirtualMailManager.constants.VERSION import - error-prone.

Fixed a logical mistake in EmailAddress.__ne__() (not used), small code cleanups.

Added sieve/managesieve switching stuff, depending on the used Dovecot version.

Fixed a libpq.OperationalError in Account.delete() Passing only the object's address string to the 'alias delete' query, not the whole EmailAddress object.