summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-09-15 08:24:20 +0000
committerMarko Kreen2010-09-15 08:24:20 +0000
commitfde06b8c545954df464428f782676026af3959ac (patch)
treea03483f0e854145759387a09427985e8369e9716
parent08f012b3699e316af1a769f52a988c02039bdc35 (diff)
skytools: Support psycopg 2.2
There fileno() has moved from cursor to connection.
-rw-r--r--python/skytools/psycopgwrapper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/skytools/psycopgwrapper.py b/python/skytools/psycopgwrapper.py
index a005100a..cdb70b69 100644
--- a/python/skytools/psycopgwrapper.py
+++ b/python/skytools/psycopgwrapper.py
@@ -170,7 +170,8 @@ def connect_database(connstr, keepalive = True,
curs = db.cursor()
# tune keepalive
- set_tcp_keepalive(curs, keepalive, tcp_keepidle, tcp_keepcnt, tcp_keepintvl)
+ fd = hasattr(db, 'fileno') and db.fileno() or curs.fileno()
+ set_tcp_keepalive(fd, keepalive, tcp_keepidle, tcp_keepcnt, tcp_keepintvl)
# fill .server_version on older psycopg
if not hasattr(db, 'server_version'):