[SQL-CVS] r4649 - SQLObject/branches/1.5/sqlobject/tests

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

Author: phd
Date: Tue Aug 20 07:18:31 2013
New Revision: 4649

Log:
Import validators from sqlobject.col, not from formencode

Modified:
   SQLObject/branches/1.5/sqlobject/tests/test_enum.py
   SQLObject/branches/1.5/sqlobject/tests/test_validation.py

Modified: SQLObject/branches/1.5/sqlobject/tests/test_enum.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Mon Aug 19 06:23:20 2013	(r4648)
+++ SQLObject/branches/1.5/sqlobject/tests/test_enum.py	Tue Aug 20 07:18:31 2013	(r4649)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import Invalid
 
 ########################################
 ## Enum test
@@ -17,9 +17,10 @@
     raises(
         (Enum1._connection.module.IntegrityError,
          Enum1._connection.module.ProgrammingError,
-         Invalid),
+         validators.Invalid),
         Enum1, l='b')
 
+
 class EnumWithNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None])
@@ -30,6 +31,7 @@
         e = EnumWithNone(l=l)
         assert e.l == l
 
+
 class EnumWithDefaultNone(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
@@ -40,6 +42,7 @@
     e = EnumWithDefaultNone()
     assert e.l == None
 
+
 class EnumWithDefaultOther(SQLObject):
 
     l = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')

Modified: SQLObject/branches/1.5/sqlobject/tests/test_validation.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/tests/test_validation.py	Mon Aug 19 06:23:20 2013	(r4648)
+++ SQLObject/branches/1.5/sqlobject/tests/test_validation.py	Tue Aug 20 07:18:31 2013	(r4649)
@@ -1,6 +1,6 @@
 from sqlobject import *
+from sqlobject.col import validators
 from sqlobject.tests.dbtest import *
-from formencode import validators
 
 ########################################
 ## Validation/conversion