[SQL-CVS] r3640 - SQLObject/branches/0.10/sqlobject

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

Author: dan
Date: 2008-11-02 14:56:31 -0700 (Sun, 02 Nov 2008)
New Revision: 3640

Modified:
   SQLObject/branches/0.10/sqlobject/col.py
   SQLObject/branches/0.10/sqlobject/dbconnection.py
Log:
Simplified getattr expressions to be terse (backport from trunk rev 3639)

Modified: SQLObject/branches/0.10/sqlobject/col.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/col.py	2008-11-02 21:53:49 UTC (rev 3639)
+++ SQLObject/branches/0.10/sqlobject/col.py	2008-11-02 21:56:31 UTC (rev 3640)
@@ -513,7 +513,7 @@
             return None
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+            dbEncoding = getattr(connection, "dbEncoding", "ascii")
             return value.encode(dbEncoding)
         return value
 
@@ -1433,7 +1433,7 @@
             return None
         if isinstance(value, unicode):
             connection = state.soObject._connection
-            dbEncoding = getattr(connection, "dbEncoding", None) or "ascii"
+            dbEncoding = getattr(connection, "dbEncoding", "ascii")
             value = value.encode(dbEncoding)
         if isinstance(value, str):
             return pickle.loads(value)

Modified: SQLObject/branches/0.10/sqlobject/dbconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/dbconnection.py	2008-11-02 21:53:49 UTC (rev 3639)
+++ SQLObject/branches/0.10/sqlobject/dbconnection.py	2008-11-02 21:56:31 UTC (rev 3640)
@@ -83,7 +83,7 @@
         atexit.register(_closeConnection, weakref.ref(self))
 
     def uri(self):
-        auth = getattr(self, 'user', None) or ''
+        auth = getattr(self, 'user', '')
         if auth:
             if self.password:
                 auth = auth + ':' + self.password