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

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

Author: phd
Date: 2010-04-20 11:49:49 -0600 (Tue, 20 Apr 2010)
New Revision: 4180

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/dbconnection.py
   SQLObject/trunk/sqlobject/main.py
Log:
Merged revisions 4178, 4179 from branch 0.12: bugs were fixed in calling from_python().


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/docs/News.txt	2010-04-20 17:49:49 UTC (rev 4180)
@@ -43,8 +43,10 @@
 SQLObject 0.12.4
 ================
 
-* A bugfix ported from `SQLObject 0.11.6`_.
+* Bugs were fixed in calling from_python().
 
+* A bugfix was ported from `SQLObject 0.11.6`_.
+
 SQLObject 0.12.3
 ================
 

Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2010-04-20 17:49:49 UTC (rev 4180)
@@ -582,7 +582,7 @@
             if key in kw:
                 value = kw.pop(key)
                 if col.from_python:
-                    value = col.from_python(value, soClass)
+                    value = col.from_python(value, sqlbuilder.SQLObjectState(soClass))
                 data[col.dbName] = value
             elif col.foreignName in kw:
                 obj = kw.pop(col.foreignName)

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-04-20 17:40:16 UTC (rev 4179)
+++ SQLObject/trunk/sqlobject/main.py	2010-04-20 17:49:49 UTC (rev 4180)
@@ -1318,7 +1318,7 @@
         for n, v in zip(name, value):
             from_python = getattr(cls, '_SO_from_python_' + n)
             if from_python:
-                v = from_python(v, cls)
+                v = from_python(v, sqlbuilder.SQLObjectState(cls))
             new_value.append(v)
         condition = sqlbuilder.AND(*[getattr(cls.q, n)==v for n,v in zip(name, new_value)])
         return (connection or cls._connection)._SO_selectOneAlt(