Switch from pyPgSQL.PgSQL to pyscopg2.

diff --git a/controller-service b/controller-service
index 899053a51d019ca058a62a1eec1558e6568204e7..ec7159af82f4fb3dde1dbfadf34a91df27562431 100755 (executable)
--- a/controller-service
+++ b/controller-service
@@ -37,7 +37,7 @@ import services.config as config
 
 class Controller(pb.Root):
     def service_setup(self):
-        self.connection_type = "pyPgSQL.PgSQL"
+        self.connection_type = "psycopg2"
         self.connection_dict = dict(cp_reconnect=True,
                                     host=config.get("db", "host"),
                                     user=config.get("db", "user"),

diff --git a/services/master/database.py b/services/master/database.py
index ab7c7eb6ed63690eaf7c6bf52ceb030d60eae5f8..f78bea0487c24555d9dbc958ed481b0cda5c3efe 100644 (file)
--- a/services/master/database.py
+++ b/services/master/database.py
@@ -55,7 +55,7 @@ class DatabaseManager:
         Start up the connection to the database.
         """
         if self.db is None:
-            self.db = adbapi.ConnectionPool("pyPgSQL.PgSQL", cp_reconnect=True,
+            self.db = adbapi.ConnectionPool("psycopg2", cp_reconnect=True,
                                             host=config.get("db", "host"),
                                             user=config.get("db", "user"),
                                             password=config.get("db", "passwd"),