Merge branch 'python2' into python3

Conflicts:
	NEWS-2.3
	tests/__init__.py
	tests/test_lobject.py
	tests/test_quote.py
	tests/testutils.py

2 files changed, 17 insertions, 0 deletions

diff --git a/psycopg/lobject_int.c b/psycopg/lobject_int.c
index b78b4a9..6ee3ecf 100644
--- a/psycopg/lobject_int.c
+++ b/psycopg/lobject_int.c
@@ -127,6 +127,21 @@ lobject_close_locked(lobjectObject *self, char **error)
 {
     int retvalue;
 
+    Dprintf("lobject_close_locked: conn->closed %ld", self->conn->closed);
+    switch (self->conn->closed) {
+    case 0:
+        /* Connection is open, go ahead */
+        break;
+    case 1:
+        /* Connection is closed, return a success */
+        return 0;
+        break;
+    default:
+        PyErr_SetString(OperationalError, "the connection is broken");
+        return -1;
+        break;
+    }
+
     if (self->conn->isolation_level == ISOLATION_LEVEL_AUTOCOMMIT ||
         self->conn->mark != self->mark ||
         self->fd == -1)
diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
index 1474cbf..76e7c24 100644
--- a/psycopg/pqpath.c
+++ b/psycopg/pqpath.c
@@ -606,6 +606,8 @@ pq_tpc_command_locked(connectionObject *conn, const char *cmd, const char *tid,
     Dprintf("_pq_tpc_command: pgconn = %p, command = %s",
             conn->pgconn, cmd);
 
+    conn->mark += 1;
+
     /* convert the xid into the postgres transaction_id and quote it. */
     if (!(etid = psycopg_escape_string((PyObject *)conn, tid, 0, NULL, NULL)))
     { goto exit; }