[SQL-CVS] r2116 - home/phd/SQLObject/paramstyles/sqlobject/postgres

[<sub...@co...>]

Author: phd
Date: 2006-12-04 08:37:51 -0700 (Mon, 04 Dec 2006)
New Revision: 2116

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
Log:
Merged patches from the revisions 2112:2115 from the trunk: a patch by Robert Forkel <xro...@go...>: psycopg1 requires port to be a string; psycopg2 requires port to be an int.

Modified: home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-12-04 15:36:19 UTC (rev 2115)
+++ home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-12-04 15:37:51 UTC (rev 2116)
@@ -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: