r6372 - in trunk/gnue-common/src/datasources: . drivers/interbase/interbase

[johannes]

Author: johannes
Date: 2004-09-22 05:05:21 -0500 (Wed, 22 Sep 2004)
New Revision: 6372

Modified:
   trunk/gnue-common/src/datasources/GConnections.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
Log:
Fixed handling of LoginErrors


Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py   2004-09-22 09:43:21 UTC 
(rev 6371)
+++ trunk/gnue-common/src/datasources/GConnections.py   2004-09-22 10:05:21 UTC 
(rev 6372)
@@ -449,20 +449,19 @@
             attempts = 0
             self._loginHandler.destroyLoginDialog()
 
-          except Exceptions.LoginError, error:
+          except Exceptions.LoginError:
             # Oops, they must have entered an invalid user/password.
             # Those silly users.
             # user: Hey! Who are you calling silly?!!!
             # Ok, then "those address@hidden users"
-            attempts = attempts - 1
-            errortext = string.replace("%s" % error,'\n','')
-            self._loginHandler.destroyLoginDialog()
+            attempts  = attempts - 1
+            errortext = errors.getException () [2]
+            self._loginHandler.destroyLoginDialog ()
 
             if not attempts:
               # Four times is plenty...
-              #self._loginHandler.destroyLoginDialog()
               tmsg = u_("Unable to log in after 4 attempts.\n\nError: %s") \
-                     % errors.getException () [2]
+                     % errortext
               raise Exceptions.LoginError, tmsg
 
           except GLoginHandler.UserCanceledLogin:

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2004-09-22 09:43:21 UTC (rev 6371)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2004-09-22 10:05:21 UTC (rev 6372)
@@ -44,7 +44,7 @@
 from string import upper, lower, rstrip
 import sys
 from gnue.common.datasources import GDataObjects, GConditions, GConnections
-from gnue.common.apps import GDebug
+from gnue.common.apps import errors
 from gnue.common.datasources.drivers import DBSIG2
 from DataObject import *
 from gnue.common.datasources.drivers.interbase.Schema.Discovery.Introspection 
import Introspection
@@ -84,13 +84,13 @@
 
   def connect(self, connectData={}):
 
-    GDebug.printMesg (1, "Interbase database driver initializing")
+    gDebug (1, "Interbase database driver initializing")
 
     try:
       ib_encoding = ib_encTable [self._encoding]
 
     except KeyError:
-      GDebug.printMesg (1, u_("Encoding '%s' is not supported by interbase "
+      gDebug (1, u_("Encoding '%s' is not supported by interbase "
                               "dbdriver. Using default encoding.") % \
                               self._encoding)
       ib_encoding = ''
@@ -110,8 +110,8 @@
       # automatically start a new transaction
       self._beginTransaction ()
 
-    except self._DatabaseError, value:
-      raise GDataObjects.LoginError, value
+    except self._DatabaseError:
+      raise GDataObjects.LoginError, errors.getException () [2]
 
 
   # ---------------------------------------------------------------------------
@@ -151,8 +151,8 @@
       cursor.close ()
 
     except mesg:
-      GDebug.printMesg (1, "**** Unable to execute extension query")
-      GDebug.printMesg (1, "**** %s" % mesg)
+      gDebug (1, "**** Unable to execute extension query")
+      gDebug (1, "**** %s" % mesg)
 
       try:
         cursor.close ()