diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-03 21:43:02 +0100 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-03 21:43:02 +0100 |
commit | 80bd6e27946ed5b56b01687913369d6c895598cb (patch) | |
tree | 70f67cdc4c4e73a6e8ac7f4862d3d0b02a1ab99b /psycopg/connection.h | |
parent | a01700d478765e8dc6044336f21fe84808569a0d (diff) | |
parent | 627df159958330b54011e378427275b0494be013 (diff) | |
download | psycopg2-80bd6e27946ed5b56b01687913369d6c895598cb.tar.gz |
Merge branch 'python2' into python3
Conflicts:
NEWS-2.3
psycopg/connection_type.c
tests/test_connection.py
tests/types_basic.py
Diffstat (limited to 'psycopg/connection.h')
-rw-r--r-- | psycopg/connection.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/psycopg/connection.h b/psycopg/connection.h index 2b66029..af2470d 100644 --- a/psycopg/connection.h +++ b/psycopg/connection.h @@ -99,7 +99,7 @@ typedef struct { PGconn *pgconn; /* the postgresql connection */ PGcancel *cancel; /* the cancellation structure */ - PyObject *async_cursor; /* a cursor executing an asynchronous query */ + PyObject *async_cursor; /* weakref to a cursor executing an asynchronous query */ int async_status; /* asynchronous execution status */ /* notice processing */ @@ -115,6 +115,7 @@ typedef struct { PyObject *binary_types; /* a set of typecasters for binary types */ int equote; /* use E''-style quotes for escaped strings */ + PyObject *weakreflist; /* list of weak references */ } connectionObject; |