[SQL-CVS] r4223 - in SQLObject/trunk: docs sqlobject

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

Author: phd
Date: 2010-07-30 03:43:10 -0600 (Fri, 30 Jul 2010)
New Revision: 4223

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/col.py
Log:
Merged revision 4222 from branch 0.13: removed SQLValidator - its attemptConvert
was never called because in FormEncode it's named attempt_convert.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-07-30 09:40:44 UTC (rev 4222)
+++ SQLObject/trunk/docs/News.txt	2010-07-30 09:43:10 UTC (rev 4223)
@@ -47,6 +47,9 @@
 
 * A new parameter 'sslmode' was added to PostgresConnection.
 
+* Removed SQLValidator - its attemptConvert was never called because in
+  FormEncode it's named attempt_convert.
+
 SQLObject 0.12.5
 ================
 

Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-07-30 09:40:44 UTC (rev 4222)
+++ SQLObject/trunk/sqlobject/col.py	2010-07-30 09:43:10 UTC (rev 4223)
@@ -72,20 +72,6 @@
 
 creationOrder = count()
 
-class SQLValidator(compound.All):
-    def attemptConvert(self, value, state, validate):
-        if validate is validators.to_python:
-            vlist = list(self.validators[:])
-            vlist.reverse()
-        elif validate is validators.from_python:
-            vlist = self.validators
-        else:
-            raise RuntimeError
-        for validator in vlist:
-            value = validate(validator, value, state)
-        return value
-
-
 ########################################
 ## Columns
 ########################################
@@ -209,7 +195,7 @@
         _validators = self.createValidators()
         if _validators:
             if validator: _validators.append(validator)
-            self.validator = SQLValidator.join(_validators[0], *_validators[1:])
+            self.validator = compound.All.join(_validators[0], *_validators[1:])
         else:
             self.validator = validator
         self.noCache = noCache