A bug caused by psycopg2 recently added a new boolean not callable autocommit attribute was fixed.

phdru · phdru · commit e7d3cb710a3f · 2011-07-14T17:20:56.000Z
git-svn-id: http://svn.colorstudy.com/SQLObject/trunk@4428 95a46c32-92d2-0310-94a5-8d71aeb3d4b3
diff --git a/docs/News.txt b/docs/News.txt
@@ -13,6 +13,9 @@ SQLObject (trunk)
 Features & Interface
 --------------------
 
+* A bug caused by psycopg2 recently added a new boolean not callable
+  autocommit attribute was fixed.
+
 SQLObject 1.1.1
 ===============
 
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
@@ -118,7 +118,10 @@ def _connectionFromParams(cls, user, password, host, port, path, args):
     def _setAutoCommit(self, conn, auto):
         # psycopg2 does not have an autocommit method.
         if hasattr(conn, 'autocommit'):
-            conn.autocommit(auto)
+            try:
+                conn.autocommit(auto)
+            except TypeError:
+                conn.autocommit = auto
 
     def makeConnection(self):
         try:
@@ -128,10 +131,7 @@ def makeConnection(self):
                 conn = self.module.connect(**self.dsn_dict)
         except self.module.OperationalError, e:
             raise self.module.OperationalError("%s; used connection string %r" % (e, self.dsn))
-        if self.autoCommit:
-            # psycopg2 does not have an autocommit method.
-            if hasattr(conn, 'autocommit'):
-                conn.autocommit(1)
+        if self.autoCommit: self._setAutoCommit(conn, 1)
         c = conn.cursor()
         if self.schema:
             c.execute("SET search_path TO " + self.schema)
