[SQL-CVS] r4070 - in SQLObject/branches/0.12: docs sqlobject

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

Author: phd
Date: 2010-01-06 08:59:10 -0700 (Wed, 06 Jan 2010)
New Revision: 4070

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/col.py
   SQLObject/branches/0.12/sqlobject/dbconnection.py
Log:
Merged a bugfix from revision 4069 - if dbEncoding is None suppose it's 'ascii'.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-01-06 15:56:37 UTC (rev 4069)
+++ SQLObject/branches/0.12/docs/News.txt	2010-01-06 15:59:10 UTC (rev 4070)
@@ -12,7 +12,7 @@
 
 * Fixed three bugs in PostgresConnection.
 
-* A change ported from `SQLObject 0.11.3`_.
+* A number of changes ported from `SQLObject 0.11.3`_.
 
 SQLObject 0.12.0
 ================
@@ -67,6 +67,9 @@
 SQLObject 0.11.3
 ================
 
+* Fixed a bug in col.py and dbconnection.py - if dbEncoding is None suppose
+  it's 'ascii'.
+
 * Fixed a bug in FirebirdConnection.
 
 * A change ported from `SQLObject 0.10.9`_.

Modified: SQLObject/branches/0.12/sqlobject/col.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/col.py	2010-01-06 15:56:37 UTC (rev 4069)
+++ SQLObject/branches/0.12/sqlobject/col.py	2010-01-06 15:59:10 UTC (rev 4070)
@@ -514,7 +514,7 @@
             return None
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding", "ascii")
+            dbEncoding = getattr(connection, "dbEncoding") 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", "ascii")
+            dbEncoding = getattr(connection, "dbEncoding") 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", "ascii")
+            dbEncoding = getattr(connection, "dbEncoding") or "ascii"
             value = value.encode(dbEncoding)
         if isinstance(value, str):
             return pickle.loads(value)

Modified: SQLObject/branches/0.12/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/dbconnection.py	2010-01-06 15:56:37 UTC (rev 4069)
+++ SQLObject/branches/0.12/sqlobject/dbconnection.py	2010-01-06 15:59:10 UTC (rev 4070)
@@ -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", "ascii")
+        self.dbEncoding = getattr(connection, "dbEncoding") or "ascii"
     def write(self, text):
         logfile = getattr(sys, self.loglevel)
         if isinstance(text, unicode):