SF.net SVN: mailmanager: [3205] MailManager/branches/RELENG_2_1/tests/classes/testStructures.py

[<ke...@us...>]

Revision: 3205
Author:   kevca
Date:     2006-06-19 07:23:58 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/mailmanager/?rev=3205&view=rev

Log Message:
-----------
Fixing postgres support

Modified Paths:
--------------
    MailManager/branches/RELENG_2_1/tests/classes/testStructures.py
Modified: MailManager/branches/RELENG_2_1/tests/classes/testStructures.py
===================================================================
--- MailManager/branches/RELENG_2_1/tests/classes/testStructures.py	2006-06-19 12:00:28 UTC (rev 3204)
+++ MailManager/branches/RELENG_2_1/tests/classes/testStructures.py	2006-06-19 14:23:58 UTC (rev 3205)
@@ -26,7 +26,6 @@
 
     import Products.ZMySQLDA.DA
     from Products.ZMySQLDA.DA import manage_addZMySQLConnection
-    from Products.ZPsycopgDA.DA import Connection as ZPsycopgConnection
 
     mysql_support = True
 
@@ -40,12 +39,14 @@
     import psycopg
     from Products import ZPsycopgDA
     from Products import ZPsycopgDA_debug
+    from Products.ZPsycopgDA.DA import Connection as ZPsycopgConnection
 
     postgres_support = True
 
 except ImportError, e:
 
     print "Warning: failed to import postgres support"
+    print e
     postgres_support = False
 
 
@@ -102,17 +103,17 @@
 
 if postgres_support:
 
-    class DebugPGDB(Products.ZPsycopgDA.db.DB):
+    class DebugPGDB(ZPsycopgDA.db.DB):
 
         def __init__(self, connection, tilevel, enc='utf-8'):
-            Products.ZPsycopgDA.db.DB.__init__(self, connection, tilevel, enc)
+            ZPsycopgDA.db.DB.__init__(self, connection, tilevel, enc)
             self.debugState = 'ok'
 
         def query(self, query_string, max_rows=None, query_data=None):
             zLOG.LOG('ZPsycopgDA:', zLOG.INFO,
                      'query: %s %s' % (pformat(query_string), pformat(query_data)))
             if self.debugState == 'ok':
-                return Products.ZPsycopgDA.db.DB.query(self, 
+                return ZPsycopgDA.db.DB.query(self, 
                     query_string, max_rows, query_data)
             elif self.debugState == 'DB Error':
                 raise psycopg.ProgrammingError('Test SQL Exception')
@@ -120,11 +121,11 @@
         def setDebugState(self, state):
             self.debugState = state
 
-    class DebugPGConnection(Products.ZPsycopgDA.DA.Connection):
+    class DebugPGConnection(ZPsycopgDA.DA.Connection):
 
         def __init__(self, id, title, connection_string, zdatetime,
                      check=None, tilevel=2, encoding='UTF-8', ustrings=0):
-            Products.ZPsycopgDA.DA.Connection.__init__(self, id, title, 
+            ZPsycopgDA.DA.Connection.__init__(self, id, title, 
                 connection_string, zdatetime, check, tilevel, encoding, ustrings)
 
         def factory(self):
@@ -500,6 +501,7 @@
         _ZPsycopgAdd          = staticmethod(manage_addZPsycopgConnection)
         _debugZPsycopgAdd     = staticmethod(manage_addDebugZPsycopgConnection)
     except NameError:
+        print "COULDN@T ADD PG"
         pass
 
     try:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.