Author: phd
Date: 2006-12-04 08:35:19 -0700 (Mon, 04 Dec 2006)
New Revision: 2113
Modified:
SQLObject/branches/0.7-bugfix/docs/News.txt
SQLObject/branches/0.7-bugfix/sqlobject/postgres/pgconnection.py
Log:
A patch by Robert Forkel <xro...@go...>:
psycopg1 requires port to be a string; psycopg2 requires port to be an int.
Modified: SQLObject/branches/0.7-bugfix/docs/News.txt
===================================================================
--- SQLObject/branches/0.7-bugfix/docs/News.txt 2006-12-04 15:18:42 UTC (rev 2112)
+++ SQLObject/branches/0.7-bugfix/docs/News.txt 2006-12-04 15:35:19 UTC (rev 2113)
@@ -15,6 +15,8 @@
* Allow multiple MSSQL connections.
+* Psycopg1 requires port to be a string; psycopg2 requires port to be an int.
+
SQLObject 0.7.2
===============
Modified: SQLObject/branches/0.7-bugfix/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/postgres/pgconnection.py 2006-12-04 15:18:42 UTC (rev 2112)
+++ SQLObject/branches/0.7-bugfix/sqlobject/postgres/pgconnection.py 2006-12-04 15:35:19 UTC (rev 2113)
@@ -45,7 +45,10 @@
if usePygresql:
dsn_dict["host"] = "%s:%d" % (host, port)
else:
- dsn_dict["port"] = port
+ if psycopg.__version__.split('.')[0] == '1':
+ dsn_dict["port"] = str(port)
+ else:
+ dsn_dict["port"] = port
if db:
dsn_dict["database"] = db
if user:
|