Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 11:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Add the content of the new value of a config var, when it is not compatible with this config type.

Browse Source
This commit is contained in:
Valentin Lorentz 2012-12-12 18:47:03 +01:00
parent d9f7e0e818
commit ad3f58efc2
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Config/test.py
View File

@ -77,7 +77,7 @@ class ConfigTestCase(ChannelPluginTestCase):
self.assertRegexp('config supybot.replies.', 'not a valid') self.assertRegexp('config supybot.replies.', 'not a valid')
self.assertRegexp('config supybot.repl', 'not a valid') self.assertRegexp('config supybot.repl', 'not a valid')
self.assertRegexp('config supybot.reply.withNickPrefix 123', self.assertRegexp('config supybot.reply.withNickPrefix 123',
'True or False') 'True or False.*, not \'123\'.')
self.assertRegexp('config supybot.replies foo', 'settable') self.assertRegexp('config supybot.replies foo', 'settable')
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

66
src/registry.py
View File

@ -40,6 +40,8 @@ import textwrap
import supybot.utils as utils import supybot.utils as utils
import supybot.i18n as i18n import supybot.i18n as i18n
_ = i18n.PluginInternationalization()
def error(s): def error(s):
"""Replace me with something better from another module!""" """Replace me with something better from another module!"""
print '***', s print '***', s
@ -308,6 +310,9 @@ class Group(object):
L = [(split(s)[-1], node) for (s, node) in L] L = [(split(s)[-1], node) for (s, node) in L]
return L return L
class _NoValueGiven:
# Special value for Value.error()
pass
class Value(Group): class Value(Group):
"""Invalid registry value. If you're getting this message, report it, """Invalid registry value. If you're getting this message, report it,
@ -323,8 +328,13 @@ class Value(Group):
if setDefault: if setDefault:
self.setValue(default) self.setValue(default)
def error(self): def error(self, value=_NoValueGiven):
if self.__doc__: if hasattr(self, 'errormsg') and value is not _NoValueGiven:
try:
s = self.errormsg % value
except TypeError:
s = self.errormsg
elif self.__doc__:
s = self.__doc__ s = self.__doc__
else: else:
s = """%s has no docstring. If you're getting this message, s = """%s has no docstring. If you're getting this message,
@ -400,6 +410,7 @@ class Value(Group):
class Boolean(Value): class Boolean(Value):
"""Value must be either True or False (or On or Off).""" """Value must be either True or False (or On or Off)."""
errormsg = _('Value must be either True or False (or On or Off), not %r.')
def set(self, s): def set(self, s):
try: try:
v = utils.str.toBool(s) v = utils.str.toBool(s)
@ -407,7 +418,7 @@ class Boolean(Value):
if s.strip().lower() == 'toggle': if s.strip().lower() == 'toggle':
v = not self.value v = not self.value
else: else:
self.error() self.error(s)
self.setValue(v) self.setValue(v)
def setValue(self, v): def setValue(self, v):
@ -415,50 +426,58 @@ class Boolean(Value):
class Integer(Value): class Integer(Value):
"""Value must be an integer.""" """Value must be an integer."""
errormsg = _('Value must be an integer, not %r.')
def set(self, s): def set(self, s):
try: try:
self.setValue(int(s)) self.setValue(int(s))
except ValueError: except ValueError:
self.error() self.error(s)
class NonNegativeInteger(Integer): class NonNegativeInteger(Integer):
"""Value must be a non-negative integer.""" """Value must be a non-negative integer."""
errormsg = _('Value must be a non-negative integer, not %r.')
def setValue(self, v): def setValue(self, v):
if v < 0: if v < 0:
self.error() self.error(v)
super(NonNegativeInteger, self).setValue(v) super(NonNegativeInteger, self).setValue(v)
class PositiveInteger(NonNegativeInteger): class PositiveInteger(NonNegativeInteger):
"""Value must be positive (non-zero) integer.""" """Value must be positive (non-zero) integer."""
errormsg = _('Value must be positive (non-zero) integer, not %r.')
def setValue(self, v): def setValue(self, v):
if not v: if not v:
self.error() self.error(v)
super(PositiveInteger, self).setValue(v) super(PositiveInteger, self).setValue(v)
class Float(Value): class Float(Value):
"""Value must be a floating-point number.""" """Value must be a floating-point number."""
errormsg = _('Value must be a floating-point number, not %r.')
def set(self, s): def set(self, s):
try: try:
self.setValue(float(s)) self.setValue(float(s))
except ValueError: except ValueError:
self.error() self.error(s)
def setValue(self, v): def setValue(self, v):
try: try:
super(Float, self).setValue(float(v)) super(Float, self).setValue(float(v))
except ValueError: except ValueError:
self.error() self.error(v)
class PositiveFloat(Float): class PositiveFloat(Float):
"""Value must be a floating-point number greater than zero.""" """Value must be a floating-point number greater than zero."""
errormsg = _('Value must be a floating-point number greater than zero, '
'not %r.')
def setValue(self, v): def setValue(self, v):
if v <= 0: if v <= 0:
self.error() self.error(v)
else: else:
super(PositiveFloat, self).setValue(v) super(PositiveFloat, self).setValue(v)
class Probability(Float): class Probability(Float):
"""Value must be a floating point number in the range [0, 1].""" """Value must be a floating point number in the range [0, 1]."""
errormsg = _('Value must be a floating point number in the range [0, 1], '
'not %r.')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.__parent = super(Probability, self) self.__parent = super(Probability, self)
self.__parent.__init__(*args, **kwargs) self.__parent.__init__(*args, **kwargs)
@ -467,22 +486,24 @@ class Probability(Float):
if 0 <= v <= 1: if 0 <= v <= 1:
self.__parent.setValue(v) self.__parent.setValue(v)
else: else:
self.error() self.error(v)
class String(Value): class String(Value):
"""Value is not a valid Python string.""" """Value is not a valid Python string."""
errormsg = _('Value is not a valid Python string, not %r.')
def set(self, s): def set(self, s):
if not s: v = s
s = '""' if not v:
elif s[0] != s[-1] or s[0] not in '\'"': v = '""'
s = repr(s) elif v[0] != v[-1] or v[0] not in '\'"':
v = repr(v)
try: try:
v = utils.safeEval(s) v = utils.safeEval(v)
if not isinstance(v, basestring): if not isinstance(v, basestring):
raise ValueError raise ValueError
self.setValue(v) self.setValue(v)
except ValueError: # This catches utils.safeEval(s) errors too. except ValueError: # This catches utils.safeEval(s) errors too.
self.error() self.error(s)
_printable = string.printable[:-4] _printable = string.printable[:-4]
def _needsQuoting(self, s): def _needsQuoting(self, s):
@ -501,7 +522,9 @@ class OnlySomeStrings(String):
'This is a bug.' 'This is a bug.'
self.__parent = super(OnlySomeStrings, self) self.__parent = super(OnlySomeStrings, self)
self.__parent.__init__(*args, **kwargs) self.__parent.__init__(*args, **kwargs)
self.__doc__ = format('Valid values include %L.', self.__doc__ = format(_('Valid values include %L.'),
map(repr, self.validStrings))
self.errormsg = format(_('Valid values include %L, not %%r.'),
map(repr, self.validStrings)) map(repr, self.validStrings))
def help(self): def help(self):
@ -518,11 +541,11 @@ class OnlySomeStrings(String):
return self.validStrings[i] return self.validStrings[i]
def setValue(self, s): def setValue(self, s):
s = self.normalize(s) v = self.normalize(s)
if s in self.validStrings: if s in self.validStrings:
self.__parent.setValue(s) self.__parent.setValue(v)
else: else:
self.error() self.error(v)
class NormalizedString(String): class NormalizedString(String):
def __init__(self, default, *args, **kwargs): def __init__(self, default, *args, **kwargs):
@ -572,6 +595,7 @@ class StringWithSpaceOnRight(String):
class Regexp(Value): class Regexp(Value):
"""Value must be a valid regular expression.""" """Value must be a valid regular expression."""
errormsg = _('Value must be a valid regular expression, not %r.')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs['setDefault'] = False kwargs['setDefault'] = False
self.sr = '' self.sr = ''
@ -677,7 +701,7 @@ class TemplatedString(String):
if utils.iter.all(hasTemplate, self.requiredTemplates): if utils.iter.all(hasTemplate, self.requiredTemplates):
self.__parent.setValue(v) self.__parent.setValue(v)
else: else:
self.error() self.error(v)
class Json(String): class Json(String):
# Json-serializable data # Json-serializable data