sqlobject-cvs

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

Author: phd
Date: 2010-01-08 04:20:08 -0700 (Fri, 08 Jan 2010)
New Revision: 4074

Modified:
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/dbconnection.py
Log:
Merged a bugfix from r4072.


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2010-01-08 11:19:21 UTC (rev 4073)
+++ SQLObject/trunk/sqlobject/col.py	2010-01-08 11:20:08 UTC (rev 4074)
@@ -514,7 +514,7 @@
             return None
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding") or "ascii"
+            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
             return value.encode(dbEncoding)
         return value
 
@@ -525,7 +525,7 @@
             return value
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding") or "ascii"
+            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
             return value.encode(dbEncoding)
         return value
 
@@ -1485,7 +1485,7 @@
             return None
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding") or "ascii"
+            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
             value = value.encode(dbEncoding)
         if isinstance(value, str):
             return pickle.loads(value)

Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2010-01-08 11:19:21 UTC (rev 4073)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2010-01-08 11:20:08 UTC (rev 4074)
@@ -31,7 +31,7 @@
     def __init__(self, connection, loglevel):
         # loglevel: None or empty string for stdout; or 'stderr'
         self.loglevel = loglevel or "stdout"
-        self.dbEncoding = getattr(connection, "dbEncoding") or "ascii"
+        self.dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
     def write(self, text):
         logfile = getattr(sys, self.loglevel)
         if isinstance(text, unicode):