From bb5d16ca3edb2af79a183b272bd29dd67d183e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 6 Feb 2009 10:26:38 +0100
Subject: [PATCH] Remove psycopg2 from server.py

---
 trytond/backend/database.py            | 1 +
 trytond/backend/postgresql/database.py | 1 +
 trytond/server.py                      | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/trytond/backend/database.py b/trytond/backend/database.py
index 8215d8c209..6e5aff76a7 100644
--- a/trytond/backend/database.py
+++ b/trytond/backend/database.py
@@ -2,6 +2,7 @@
 #this repository contains the full copyright notices and license terms.
 
 DatabaseIntegrityError = None
+DatabaseOperationalError = None
 
 class DatabaseInterface(object):
     '''
diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py
index 3dd15baad3..f4a528b8c9 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -11,6 +11,7 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 from psycopg2.extensions import register_type, register_adapter
 from psycopg2.extensions import UNICODE, AsIs
 from psycopg2 import IntegrityError as DatabaseIntegrityError
+from psycopg2 import OperationalError as DatabaseOperationalError
 import time
 import logging
 import re
diff --git a/trytond/server.py b/trytond/server.py
index 8e00af1fd4..70eb896aab 100644
--- a/trytond/server.py
+++ b/trytond/server.py
@@ -10,7 +10,6 @@ logging.basicConfig(level=logging.DEBUG, format=format, datefmt=datefmt)
 import sys, os, signal
 import netsvc
 import time
-import psycopg2
 import pooler
 from backend import Database
 import config
@@ -29,6 +28,7 @@ import sha
 import logging
 import logging.handlers
 import threading
+from trytond.backend import DatabaseOperationalError
 
 
 class TrytonServer(object):
@@ -91,7 +91,7 @@ class TrytonServer(object):
             init[db_name] = False
             try:
                 cursor = pooler.get_db_only(db_name).cursor()
-            except psycopg2.OperationalError:
+            except DatabaseOperationalError:
                 self.logger.error("could not connect to database '%s'!" % db_name,)
                 continue
 
@@ -111,7 +111,7 @@ class TrytonServer(object):
         for db_name in CONFIG["db_name"]:
             try:
                 cursor = pooler.get_db_only(db_name).cursor()
-            except psycopg2.OperationalError:
+            except DatabaseOperationalError:
                 self.logger.error("could not connect to database '%s'!" % db_name,)
                 continue
             if not cursor.test():