[SQL-CVS] r3780 - in SQLObject/trunk: . docs sqlobject/tests

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

Author: phd
Date: 2009-02-02 15:39:12 -0700 (Mon, 02 Feb 2009)
New Revision: 3780

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/setup.py
   SQLObject/trunk/sqlobject/tests/test_validation.py
Log:
Merged revision 3778 from the branch 0.9: require FormEncode version 1.1.1+.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-02-02 22:22:16 UTC (rev 3779)
+++ SQLObject/trunk/docs/News.txt	2009-02-02 22:39:12 UTC (rev 3780)
@@ -162,6 +162,8 @@
    - MySQLdb = 1.2.1: only unicode
    - MySQLdb > 1.2.1: both ascii and unicode
 
+* Setup requires FormEncode version 1.1.1+.
+
 SQLObject 0.9.9
 ===============
 

Modified: SQLObject/trunk/setup.py
===================================================================
--- SQLObject/trunk/setup.py	2009-02-02 22:22:16 UTC (rev 3779)
+++ SQLObject/trunk/setup.py	2009-02-02 22:39:12 UTC (rev 3780)
@@ -53,7 +53,7 @@
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],
-      install_requires=["FormEncode>=0.2.2"],
+      install_requires=["FormEncode>=1.1.1"],
       extras_require={
         'mysql': ['MySQLdb'],
         'postgresql': ['psycopg'], # or pgdb from PyGreSQL

Modified: SQLObject/trunk/sqlobject/tests/test_validation.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_validation.py	2009-02-02 22:22:16 UTC (rev 3779)
+++ SQLObject/trunk/sqlobject/tests/test_validation.py	2009-02-02 22:39:12 UTC (rev 3780)
@@ -12,6 +12,7 @@
     name2 = StringCol(validator=validators.ConfirmType(type=str), default='y')
     name3 = IntCol(validator=validators.Wrapper(fromPython=int), default=100)
     name4 = FloatCol(default=2.718)
+    name5 = PickleCol(default=None)
 
 class TestValidation:
 
@@ -42,3 +43,7 @@
         assert t.name3 == 1
         t.name3 = 0
         assert t.name3 == 0
+
+    def test_emptyValue(self):
+        t = SOValidation(name5={})
+        assert t.name5 == {}