Author: phd
Date: 2010-01-08 04:18:25 -0700 (Fri, 08 Jan 2010)
New Revision: 4072
Modified:
SQLObject/branches/0.11/sqlobject/col.py
SQLObject/branches/0.11/sqlobject/dbconnection.py
Log:
Default for getattr is None.
Modified: SQLObject/branches/0.11/sqlobject/col.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/col.py 2010-01-06 16:00:51 UTC (rev 4071)
+++ SQLObject/branches/0.11/sqlobject/col.py 2010-01-08 11:18:25 UTC (rev 4072)
@@ -513,7 +513,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
@@ -524,7 +524,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
@@ -1482,7 +1482,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/branches/0.11/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/dbconnection.py 2010-01-06 16:00:51 UTC (rev 4071)
+++ SQLObject/branches/0.11/sqlobject/dbconnection.py 2010-01-08 11:18:25 UTC (rev 4072)
@@ -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):
|
