From 73e822ca567d20a88c7c53256d2c46aaab5236cb Mon Sep 17 00:00:00 2001
From: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
Date: Mon, 19 Apr 2010 00:53:40 -0400
Subject: [PATCH] Undo mtughan's bugfix from
 7f9a1130605fb6b36967f062d3cbcdb73aff8df6, so i can merge jamessan's fix
 ef8bd817e8b62ede76aa7501a9a8d69af7408efc

---
 src/registry.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/registry.py b/src/registry.py
index 3d3911810..19b533085 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -311,10 +311,8 @@ class Value(Group):
         if setDefault:
             self.setValue(default)
 
-    def error(self, message=None):
-        if message:
-            s = message
-        elif self.__doc__:
+    def error(self):
+        if self.__doc__:
             s = self.__doc__
         else:
             s = """%s has no docstring.  If you're getting this message,
@@ -545,7 +543,7 @@ class Regexp(Value):
         self.__parent.__init__(*args, **kwargs)
 
     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):
         try: