diff -r 33f727efa7c4 -r 0c8c053b451c VirtualMailManager/cli/Handler.py --- a/VirtualMailManager/cli/Handler.py Thu Feb 25 17:56:08 2010 +0000 +++ b/VirtualMailManager/cli/Handler.py Fri Feb 26 02:35:25 2010 +0000 @@ -10,7 +10,7 @@ import os -from VirtualMailManager.Exceptions import VMMException +from VirtualMailManager.errors import VMMError from VirtualMailManager.Handler import Handler from VirtualMailManager.cli import read_pass from VirtualMailManager.cli.Config import CliConfig as Cfg @@ -33,7 +33,7 @@ def __init__(self): """Creates a new CliHandler instance. - Throws a VMMNotRootException if your uid is greater 0. + Throws a NotRootError if your uid is greater 0. """ # Overwrite the parent CTor partly, we use the CliConfig class # and add some command line checks. @@ -64,8 +64,8 @@ elif self._Cfg.has_section(section): self._Cfg.configure([section]) else: - raise VMMException(_(u'Invalid section: ā€œ%sā€') % section, - INVALID_SECTION) + raise VMMError(_(u'Invalid section: ā€œ%sā€') % section, + INVALID_SECTION) def userAdd(self, emailaddress, password): if password is None: