Undo mtughan's bugfix from 7f9a113060, so i can merge jamessan's fix ef8bd817e8

This commit is contained in:
Daniel Folkinshteyn 2010-04-19 00:53:40 -04:00 committed by Valentin Lorentz
parent d433bfc8f0
commit 73e822ca56

View File

@ -311,10 +311,8 @@ class Value(Group):
if setDefault: if setDefault:
self.setValue(default) self.setValue(default)
def error(self, message=None): def error(self):
if message: if self.__doc__:
s = message
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,
@ -545,7 +543,7 @@ class Regexp(Value):
self.__parent.__init__(*args, **kwargs) self.__parent.__init__(*args, **kwargs)
def error(self, e): def error(self, e):
self.__parent.error('%s' % e) self.__parent.error('Value must be a regexp of the form %s' % e)
def set(self, s): def set(self, s):
try: try: