[SQL-CVS] r514 - trunk/SQLObject/sqlobject/include

[<sub...@co...>]

Author: phd
Date: 2005-01-05 14:38:39 +0000 (Wed, 05 Jan 2005)
New Revision: 514

Modified:
   trunk/SQLObject/sqlobject/include/validators.py
Log:
Fixed a number of bugs in calls to fromPython/toPython/attemptConvert.


Modified: trunk/SQLObject/sqlobject/include/validators.py
===================================================================
--- trunk/SQLObject/sqlobject/include/validators.py	2005-01-05 13:15:21 UTC (rev 513)
+++ trunk/SQLObject/sqlobject/include/validators.py	2005-01-05 14:38:39 UTC (rev 514)
@@ -224,13 +224,11 @@
         self.validators = validators
         FancyValidator.__init__(self, ifInvalid=ifInvalid, **kw)
 
-    def _toPython(self, value, state=None):
-        return self.attemptConvert(self, value, state,
-                                   toPython)
+    def toPython(self, value, state=None):
+        return self.attemptConvert(value, state, toPython)
 
-    def _fromPython(self, value, state):
-        return self.attemptConvert(self, value, state,
-                                   fromPython)
+    def fromPython(self, value, state):
+        return self.attemptConvert(value, state, fromPython)
 
     def matchesProtocol(self, validator, state):
         target = validator.protocols