[SQL-CVS] r4069 - in SQLObject/branches/0.11: docs sqlobject

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

Author: phd
Date: 2010-01-06 08:56:37 -0700 (Wed, 06 Jan 2010)
New Revision: 4069

Modified:
   SQLObject/branches/0.11/docs/News.txt
   SQLObject/branches/0.11/sqlobject/col.py
   SQLObject/branches/0.11/sqlobject/dbconnection.py
Log:
Fixed a bug - if dbEncoding is None suppose it's 'ascii'.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-01-06 15:46:27 UTC (rev 4068)
+++ SQLObject/branches/0.11/docs/News.txt	2010-01-06 15:56:37 UTC (rev 4069)
@@ -10,6 +10,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.11/sqlobject/col.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/col.py	2010-01-06 15:46:27 UTC (rev 4068)
+++ SQLObject/branches/0.11/sqlobject/col.py	2010-01-06 15:56:37 UTC (rev 4069)
@@ -513,7 +513,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
 
@@ -524,7 +524,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
 
@@ -1482,7 +1482,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.11/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/dbconnection.py	2010-01-06 15:46:27 UTC (rev 4068)
+++ SQLObject/branches/0.11/sqlobject/dbconnection.py	2010-01-06 15:56:37 UTC (rev 4069)
@@ -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):