Rename AmbigousOptionError as ConflictOptionError

This commit is contained in:
2013-04-17 21:50:31 +02:00
parent 3170237c8e
commit 80438b1495
3 changed files with 67 additions and 39 deletions

View File

@ -21,7 +21,7 @@
# the whole pypy projet is under MIT licence
# ____________________________________________________________
#from inspect import getmembers, ismethod
from tiramisu.error import PropertiesOptionError, AmbigousOptionError
from tiramisu.error import PropertiesOptionError, ConflictOptionError
from tiramisu.option import OptionDescription, Option, SymLinkOption
from tiramisu.setting import groups, Setting, apply_requires
from tiramisu.value import Values
@ -401,7 +401,7 @@ class Config(SubConfig):
child = getattr(homeconfig._cfgimpl_descr, name)
homeconfig.setoption(name, child, value)
elif len(candidates) > 1:
raise AmbigousOptionError(
raise ConflictOptionError(
_('more than one option that ends with {}').format(key))
else:
raise AttributeError(

View File

@ -27,7 +27,7 @@
#AttributeError if no option or optiondescription in optiondescription (also when specified a path)
class AmbigousOptionError(StandardError):
class ConflictOptionError(StandardError):
"more than one option"
pass